Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
cb2eb69c
Commit
cb2eb69c
authored
Aug 24, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
2b17e686
a56ab8f2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
379 additions
and
167 deletions
+379
-167
CommonConstants.java
...ud.plus.v1/yifu/common/core/constant/CommonConstants.java
+4
-0
Common.java
.../com/yifu.cloud.plus.v1/yifu/common/core/util/Common.java
+24
-0
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+12
-12
TInsuranceOperate.java
...oud/plus/v1/yifu/insurances/entity/TInsuranceOperate.java
+6
-0
InsuranceExportListParam.java
.../plus/v1/yifu/insurances/vo/InsuranceExportListParam.java
+24
-0
InsuranceListParam.java
.../cloud/plus/v1/yifu/insurances/vo/InsuranceListParam.java
+2
-6
InsuranceRefundHandlingParam.java
...s/v1/yifu/insurances/vo/InsuranceRefundHandlingParam.java
+8
-2
TInsuranceDetailController.java
...ifu/insurances/controller/TInsuranceDetailController.java
+16
-15
TInsuranceEnclosureController.java
.../insurances/controller/TInsuranceEnclosureController.java
+0
-2
TInsuranceDetailService.java
...s/v1/yifu/insurances/service/TInsuranceDetailService.java
+7
-8
TInsuranceDetailServiceImpl.java
.../insurances/service/impl/TInsuranceDetailServiceImpl.java
+62
-34
TInsuranceEnclosureServiceImpl.java
...surances/service/impl/TInsuranceEnclosureServiceImpl.java
+23
-9
TInsuranceDetailMapper.xml
...-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml
+30
-21
TInsuranceOperateMapper.xml
...biz/src/main/resources/mapper/TInsuranceOperateMapper.xml
+1
-0
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+1
-1
TSalaryStandardMapper.xml
...y-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
+2
-0
TPaymentInfo.java
...m/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
+30
-5
TPaymentInfoVo.java
...com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoVo.java
+31
-9
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+47
-22
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+15
-5
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+34
-16
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java
View file @
cb2eb69c
...
...
@@ -245,6 +245,10 @@ public interface CommonConstants {
public
static
final
String
SPOT
=
"."
;
int
FIFTY_INT
=
50
;
int
BYTE
=
1024
;
/**
* 员工初始序列
* @Author pwang
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/Common.java
View file @
cb2eb69c
...
...
@@ -471,4 +471,28 @@ public class Common {
}
return
obj
;
}
/**
* 商险附件允许上传的文件类型
*
* @Author pwang
* @Date 2020-01-07 15:52
* @param null
* @return
**/
private
static
final
String
insuranceSuffixList
=
"pdf|png|jpg|doc|docx|xls|xlsx|rar|zip"
;
/**
* 判断是否为允许的上传文件类型,true表示允许
*/
public
static
boolean
checkInsuranceFile
(
String
fileName
)
{
// 获取文件后缀
String
suffix
=
getSuffix
(
fileName
);
if
(
null
!=
suffix
)
{
if
(
insuranceSuffixList
.
contains
(
suffix
.
trim
().
toLowerCase
()))
{
return
true
;
}
}
return
false
;
}
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
cb2eb69c
...
...
@@ -10,7 +10,7 @@ public class InsurancesConstants {
/**
* 新增
*/
public
static
final
String
ADD
=
"
新增
"
;
public
static
final
String
ADD
=
"
“新增”提交申请
"
;
/**
* 离职
*/
...
...
@@ -18,11 +18,11 @@ public class InsurancesConstants {
/**
* 批增
*/
public
static
final
String
BATCH
=
"
批增
"
;
public
static
final
String
BATCH
=
"
“批增”提交申请
"
;
/**
* 替换
*/
public
static
final
String
REPLACE
=
"
替换
"
;
public
static
final
String
REPLACE
=
"
“替换”提交申请
"
;
/**
* 删除
*/
...
...
@@ -38,15 +38,15 @@ public class InsurancesConstants {
/**
* 投保导出办理
*/
public
static
final
String
EXPORT
=
"投保
导出办理
"
;
public
static
final
String
EXPORT
=
"投保
中
"
;
/**
* 投保退回
*/
public
static
final
String
ROLLBACK
=
"投保退回"
;
/**
* 投保
办理
成功
* 投保成功
*/
public
static
final
String
SUCCESSFUL
=
"投保
办理
成功"
;
public
static
final
String
SUCCESSFUL
=
"投保成功"
;
/**
* 登记保单保费
*/
...
...
@@ -701,23 +701,23 @@ public class InsurancesConstants {
/**
* 导入减员数据
*/
public
static
final
String
INSURANCE_REFUND_IMPORT
=
"
减员
提交申请"
;
public
static
final
String
INSURANCE_REFUND_IMPORT
=
"
“减员”
提交申请"
;
/**
* 减员导出办理
*/
public
static
final
String
INSURANCE_REFUND_EXPORT
=
"减员
办理
中"
;
public
static
final
String
INSURANCE_REFUND_EXPORT
=
"减员中"
;
/**
* 减员
办理
成功
* 减员成功
*/
public
static
final
String
INSURANCE_REFUND_SUCCESS
=
"减员
办理
成功"
;
public
static
final
String
INSURANCE_REFUND_SUCCESS
=
"减员成功"
;
/**
* 减员退回
成功
* 减员退回
*/
public
static
final
String
INSURANCE_REFUND_FAILED
=
"减员
办理
退回"
;
public
static
final
String
INSURANCE_REFUND_FAILED
=
"减员退回"
;
/**
* 变更所属项目
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceOperate.java
View file @
cb2eb69c
...
...
@@ -42,6 +42,12 @@ public class TInsuranceOperate implements Serializable {
@Schema
(
description
=
"备注(审核意见)"
)
private
String
remark
;
/**
* 是否显示 0不显示/1显示
*/
@Schema
(
description
=
"是否显示 0不显示/1显示"
)
private
Integer
displayFlag
;
/**
* 创建者
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceExportListParam.java
View file @
cb2eb69c
...
...
@@ -51,4 +51,28 @@ public class InsuranceExportListParam implements Serializable {
*/
@Schema
(
description
=
"办理地分流sql"
)
private
String
regionSql
;
/**
* 购买类型, 1新增、3批增、4替换
*/
@Schema
(
description
=
" 购买类型(派单类型), 1新增、3批增、4替换"
)
private
Integer
buyType
;
/**
* 创建者-姓名
*/
@Schema
(
description
=
"派单人"
)
private
String
createName
;
/**
* 派单开始时间
*/
@Schema
(
description
=
"派单开始时间"
)
private
String
startDate
;
/**
* 派单结束时间
*/
@Schema
(
description
=
"派单结束时间"
)
private
String
endDate
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListParam.java
View file @
cb2eb69c
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.time.LocalDate
;
import
java.util.List
;
/**
...
...
@@ -93,14 +91,12 @@ public class InsuranceListParam implements Serializable {
/**
* 派单开始时间
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@Schema
(
description
=
"派单开始时间"
)
private
LocalDate
startDate
;
private
String
startDate
;
/**
* 派单结束时间
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@Schema
(
description
=
"派单结束时间"
)
private
LocalDate
endDate
;
private
String
endDate
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundHandlingParam.java
View file @
cb2eb69c
...
...
@@ -89,6 +89,12 @@ public class InsuranceRefundHandlingParam implements Serializable {
@Schema
(
description
=
"办理人"
)
private
String
updateBy
;
/**
* 派单类型
*/
@Schema
(
description
=
"派单类型"
)
private
String
buyType
;
/**
* 派单人
*/
...
...
@@ -99,13 +105,13 @@ public class InsuranceRefundHandlingParam implements Serializable {
* 派单开始时间
*/
@Schema
(
description
=
"派单开始时间"
)
private
String
createStartTim
e
;
private
String
startDat
e
;
/**
* 派单结束时间
*/
@Schema
(
description
=
"派单结束时间"
)
private
String
createEndTim
e
;
private
String
endDat
e
;
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @
cb2eb69c
...
...
@@ -55,32 +55,19 @@ public class TInsuranceDetailController {
}
/**
* EKP2INSURANCES 更新结算状态
* EKP2INSURANCES 更新结算状态
(已弃用)
*
* @author licancan
* @param param
* @return {@link R<String>}
*/
@Deprecated
@Operation
(
summary
=
"更新结算状态"
,
description
=
"更新结算状态"
)
@PostMapping
(
"/updateInsuranceSettle"
)
public
R
<
String
>
updateInsuranceSettle
(
@RequestBody
UpdateInsuranceSettleParam
param
)
{
return
tInsuranceDetailService
.
updateInsuranceSettle
(
param
);
}
/**
* 投保办理分页查询
*
* @author licancan
* @param page
* @param param
* @return {@link R<IPage<InsuranceListVO>>}
*/
@Operation
(
summary
=
"投保办理分页查询"
,
description
=
"投保办理分页查询"
)
@PostMapping
(
"/getInsuranceHandleListPage"
)
public
R
<
IPage
<
InsuranceListVO
>>
getInsuranceHandleListPage
(
Page
<
InsuranceListVO
>
page
,
@RequestBody
InsuranceListParam
param
)
{
return
R
.
ok
(
tInsuranceDetailService
.
getInsuranceHandleListPage
(
page
,
param
));
}
/**
* 投保分页查询
*
...
...
@@ -108,6 +95,20 @@ public class TInsuranceDetailController {
return
R
.
ok
(
tInsuranceDetailService
.
getInsuranceList
(
param
));
}
/**
* 投保办理分页查询
*
* @author licancan
* @param page
* @param param
* @return {@link R<IPage<InsuranceListVO>>}
*/
@Operation
(
summary
=
"投保办理分页查询"
,
description
=
"投保办理分页查询"
)
@PostMapping
(
"/getInsuranceHandleListPage"
)
public
R
<
IPage
<
InsuranceListVO
>>
getInsuranceHandleListPage
(
Page
<
InsuranceListVO
>
page
,
@RequestBody
InsuranceListParam
param
)
{
return
R
.
ok
(
tInsuranceDetailService
.
getInsuranceHandleListPage
(
page
,
param
));
}
/**
* 商险新增
*
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceEnclosureController.java
View file @
cb2eb69c
...
...
@@ -39,8 +39,6 @@ public class TInsuranceEnclosureController {
@Resource
TInsuranceEnclosureService
tInsuranceEnclosureService
;
private
final
OSSUtil
ossUtil
;
/**
* 商险文件上传
*
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceDetailService.java
View file @
cb2eb69c
...
...
@@ -50,24 +50,23 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
IPage
<
InsuranceListVO
>
getInsuranceListPage
(
Page
<
InsuranceListVO
>
page
,
InsuranceListParam
param
);
/**
* 投保
办理
分页查询
* 投保
不
分页查询
*
* @author licancan
* @param page
* @param param
* @return {@link
IPage
<InsuranceListVO>}
* @return {@link
List
<InsuranceListVO>}
*/
IPage
<
InsuranceListVO
>
getInsuranceHandleListPage
(
Page
<
InsuranceListVO
>
page
,
InsuranceListParam
param
);
List
<
InsuranceListVO
>
getInsuranceList
(
InsuranceListParam
param
);
/**
* 投保
不
分页查询
* 投保
办理
分页查询
*
* @author licancan
* @param page
* @param param
* @return {@link
List
<InsuranceListVO>}
* @return {@link
IPage
<InsuranceListVO>}
*/
List
<
InsuranceListVO
>
getInsuranceList
(
InsuranceListParam
param
);
IPage
<
InsuranceListVO
>
getInsuranceHandleListPage
(
Page
<
InsuranceListVO
>
page
,
InsuranceListParam
param
);
/**
* 商险新增
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java
View file @
cb2eb69c
This diff is collapsed.
Click to expand it.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceEnclosureServiceImpl.java
View file @
cb2eb69c
...
...
@@ -13,14 +13,17 @@ import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEnclosure
;
import
com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceEnclosureMapper
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceEnclosureService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceEnclosureParam
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.web.multipart.MultipartFile
;
import
java.io.IOException
;
import
java.net.URL
;
import
java.time.LocalDateTime
;
import
java.util.Objects
;
/**
* @author Administrator
...
...
@@ -50,10 +53,19 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
*/
@Override
public
R
uploadInsuranceEnclosure
(
MultipartFile
file
,
String
filePath
,
String
remark
)
throws
IOException
{
String
enclosureName
=
file
.
getOriginalFilename
().
substring
(
0
,
file
.
getOriginalFilename
().
lastIndexOf
(
"."
));
if
(
Common
.
isEmpty
(
file
)){
return
R
.
failed
(
"商险附件为空"
);
}
if
(!
Common
.
checkInsuranceFile
(
file
.
getOriginalFilename
())){
return
R
.
failed
(
"非法的文件类型"
);
}
if
(
file
.
getSize
()
>
(
CommonConstants
.
FIFTY_INT
*
CommonConstants
.
BYTE
*
CommonConstants
.
BYTE
)){
return
R
.
failed
(
"文件超出上传上限"
);
}
String
enclosureName
=
Objects
.
requireNonNull
(
file
.
getOriginalFilename
()).
substring
(
0
,
file
.
getOriginalFilename
().
lastIndexOf
(
"."
));
String
fileName
=
System
.
currentTimeMillis
()
+
"_"
+
file
.
getOriginalFilename
();
//filePath不传默认存储空间的根目录
//
jpg,jpeg,png,bmp
//
支持的附件格式
String
key
=
""
;
if
(!
Common
.
isNotNull
(
filePath
))
{
key
=
fileName
;
...
...
@@ -61,13 +73,17 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
key
=
filePath
+
"/"
+
fileName
;
}
boolean
flag
=
ossUtil
.
uploadFileByStream
(
file
.
getInputStream
(),
key
,
null
);
FileVo
fileVo
;
TInsuranceEnclosure
insuranceEnclosure
=
new
TInsuranceEnclosure
();
URL
url
=
null
;
if
(
flag
)
{
TInsuranceEnclosure
insuranceEnclosure
=
new
TInsuranceEnclosure
();
log
.
info
(
"文件:"
+
fileName
+
"上传至存储空间"
+
ossUtil
.
getBucketName
()
+
"成功!"
);
insuranceEnclosure
.
setDeleteFlag
(
CommonConstants
.
ZERO_INT
);
if
(
StringUtils
.
isNotBlank
(
remark
)){
if
(!
ValidityUtil
.
validate50
(
remark
)){
return
R
.
failed
(
"备注字段不能超过50"
);
}
else
{
insuranceEnclosure
.
setRemark
(
remark
);
}
}
insuranceEnclosure
.
setEnclosureName
(
enclosureName
);
insuranceEnclosure
.
setEnclosureAddress
(
key
);
try
{
...
...
@@ -77,9 +93,7 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
ossUtil
.
deleteObject
(
null
,
key
);
return
R
.
failed
(
"failed:"
+
e
.
getMessage
());
}
url
=
ossUtil
.
getObjectUrl
(
null
,
insuranceEnclosure
.
getEnclosureAddress
());
fileVo
=
new
FileVo
(
insuranceEnclosure
.
getId
().
toString
(),
insuranceEnclosure
.
getEnclosureName
(),
url
.
toString
());
return
R
.
ok
(
fileVo
);
return
R
.
ok
(
"商险附件上传成功"
);
}
else
{
return
R
.
failed
(
"failed:上传至存储空间失败"
);
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml
View file @
cb2eb69c
...
...
@@ -131,8 +131,8 @@
ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
</select>
<!--投保
办理
分页查询-->
<select
id=
"getInsurance
HandleListPage
"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO"
>
<!--投保
不
分页查询-->
<select
id=
"getInsurance
List
"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO"
>
select detail.id as id,
detail.EMP_NAME as empName,
detail.EMP_IDCARD_NO as empIdcardNo,
...
...
@@ -144,6 +144,7 @@
detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
detail.INSURANCE_TYPE_NAME as insuranceTypeName,
detail.BUY_STANDARD as buyStandard,
detail.CREATE_BY as createBy,
detail.CREATE_NAME as createName,
detail.BUY_HANDLE_STATUS as buyHandleStatus,
detail.SETTLE_TYPE as settleType,
...
...
@@ -153,6 +154,12 @@
<if
test=
"param.deptNo != null and param.deptNo.trim() != ''"
>
and detail.DEPT_NO = #{param.deptNo}
</if>
<if
test=
"param.deptNo == null or param.deptNo.trim() == ''"
>
and detail.DEPT_NO in
<foreach
collection=
"param.deptNoList"
index=
"index"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
<if
test=
"param.buyHandleStatus != null"
>
and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
</if>
...
...
@@ -174,12 +181,6 @@
#{item}
</foreach>
</if>
<if
test=
"param.regionSql != null and param.regionSql.trim() != ''"
>
and ${param.regionSql}
</if>
<if
test=
"param.updateBy != null and param.updateBy.trim() != ''"
>
and detail.HANDLED_BY = #{param.updateBy}
</if>
<if
test=
"param.buyType != null"
>
and detail.BUY_TYPE = #{param.buyType}
</if>
...
...
@@ -192,8 +193,8 @@
ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
</select>
<!--投保
不
分页查询-->
<select
id=
"getInsurance
List
"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO"
>
<!--投保
办理
分页查询-->
<select
id=
"getInsurance
HandleListPage
"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO"
>
select detail.id as id,
detail.EMP_NAME as empName,
detail.EMP_IDCARD_NO as empIdcardNo,
...
...
@@ -205,7 +206,6 @@
detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
detail.INSURANCE_TYPE_NAME as insuranceTypeName,
detail.BUY_STANDARD as buyStandard,
detail.CREATE_BY as createBy,
detail.CREATE_NAME as createName,
detail.BUY_HANDLE_STATUS as buyHandleStatus,
detail.SETTLE_TYPE as settleType,
...
...
@@ -215,12 +215,6 @@
<if
test=
"param.deptNo != null and param.deptNo.trim() != ''"
>
and detail.DEPT_NO = #{param.deptNo}
</if>
<if
test=
"param.deptNo == null or param.deptNo.trim() == ''"
>
and detail.DEPT_NO in
<foreach
collection=
"param.deptNoList"
index=
"index"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
<if
test=
"param.buyHandleStatus != null"
>
and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
</if>
...
...
@@ -242,6 +236,12 @@
#{item}
</foreach>
</if>
<if
test=
"param.regionSql != null and param.regionSql.trim() != ''"
>
and ${param.regionSql}
</if>
<if
test=
"param.updateBy != null and param.updateBy.trim() != ''"
>
and detail.HANDLED_BY = #{param.updateBy}
</if>
<if
test=
"param.buyType != null"
>
and detail.BUY_TYPE = #{param.buyType}
</if>
...
...
@@ -374,6 +374,15 @@
<if
test=
"param.regionSql != null and param.regionSql.trim() != ''"
>
and ${param.regionSql}
</if>
<if
test=
"param.buyType != null"
>
and detail.BUY_TYPE = #{param.buyType}
</if>
<if
test=
"param.createName != null and param.createName.trim() != ''"
>
and detail.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
</if>
<if
test=
"param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''"
>
and detail.CREATE_TIME
<![CDATA[ >= ]]>
concat(#{param.startDate}, ' 00:00:00') and detail.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, ' 23:59:59')
</if>
ORDER BY detail.CREATE_TIME DESC
</select>
...
...
@@ -720,11 +729,11 @@
<if
test=
"param.createName != null and param.createName.trim() != ''"
>
and refund.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
</if>
<if
test=
"param.
createStartTime != null and param.createStartTim
e.trim() != ''"
>
AND refund.CREATE_TIME
<![CDATA[ >= ]]>
concat(#{param.
createStartTim
e}, ' 00:00:00')
<if
test=
"param.
startDate != null and param.startDat
e.trim() != ''"
>
AND refund.CREATE_TIME
<![CDATA[ >= ]]>
concat(#{param.
startDat
e}, ' 00:00:00')
</if>
<if
test=
"param.
createEndTime != null and param.createEndTim
e.trim() != ''"
>
AND refund.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.
createEndTim
e}, ' 23:59:59')
<if
test=
"param.
endDate != null and param.endDat
e.trim() != ''"
>
AND refund.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.
endDat
e}, ' 23:59:59')
</if>
ORDER BY refund.CREATE_TIME DESC,detail.ID ASC
</select>
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceOperateMapper.xml
View file @
cb2eb69c
...
...
@@ -9,6 +9,7 @@
<result
property=
"insuranceDetailId"
column=
"INSURANCE_DETAIL_ID"
jdbcType=
"VARCHAR"
/>
<result
property=
"operateDesc"
column=
"OPERATE_DESC"
jdbcType=
"VARCHAR"
/>
<result
property=
"remark"
column=
"REMARK"
jdbcType=
"VARCHAR"
/>
<result
property=
"displayFlag"
column=
"DISPLAY_FLAG"
jdbcType=
"TINYINT"
/>
<result
property=
"createBy"
column=
"CREATE_BY"
jdbcType=
"VARCHAR"
/>
<result
property=
"createName"
column=
"CREATE_NAME"
jdbcType=
"VARCHAR"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
jdbcType=
"TIMESTAMP"
/>
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
cb2eb69c
...
...
@@ -1878,7 +1878,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
salary
.
setOwnMoney
(
ownMoney
);
for
(
TSalaryAccount
account
:
aList
)
{
relaySalarySum
=
relaySalarySum
.
add
(
account
.
getRelaySalary
Unit
());
relaySalarySum
=
relaySalarySum
.
add
(
account
.
getRelaySalary
());
}
TSalaryDetailVo
salaryDetailVo
=
new
TSalaryDetailVo
();
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @
cb2eb69c
...
...
@@ -71,6 +71,7 @@
<result
property=
"repeatMoney"
column=
"REPEAT_MONEY"
/>
<result
property=
"repeatNums"
column=
"REPEAT_NUMS"
/>
<result
property=
"isRepeat"
column=
"IS_REPEAT"
/>
<result
property=
"repeatRemark"
column=
"REPEAT_REMARK"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -120,6 +121,7 @@
a.REPEAT_MONEY,
a.REPEAT_NUMS,
a.IS_REPEAT,
a.REPEAT_REMARK,
a.INVOICE_TITLE
</sql>
<sql
id=
"tSalaryStandard_where"
>
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
View file @
cb2eb69c
...
...
@@ -90,15 +90,40 @@ public class TPaymentInfo extends BaseEntity {
@ExcelAttribute
(
name
=
"客户名称"
)
@Schema
(
description
=
"客户名称"
)
@ExcelProperty
(
"客户名称"
)
private
String
unitName
;
/**
* 客户Id
*/
@ExcelAttribute
(
name
=
"客户Id"
)
@Schema
(
description
=
"客户Id"
)
@ExcelProperty
(
"客户Id"
)
private
String
unitId
;
/**
* 项目id
*/
@ExcelAttribute
(
name
=
"项目id"
)
@Schema
(
description
=
"项目id"
)
@ExcelProperty
(
"项目id"
)
private
String
settleDomainId
;
/**
* 项目名称
*/
@ExcelAttribute
(
name
=
"项目名称"
)
@Schema
(
description
=
"项目名称"
)
@ExcelProperty
(
"项目名称"
)
private
String
settleDomainId
;
private
String
settleDomainName
;
/**
* 项目编码
*/
@Length
(
max
=
50
,
message
=
"项目编码不能超过50个字符"
)
@ExcelAttribute
(
name
=
"项目编码"
,
maxLength
=
50
)
@Schema
(
description
=
"项目编码"
)
@ExcelProperty
(
"项目编码"
)
private
String
settleDomainCode
;
/**
* 社保户
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoVo.java
View file @
cb2eb69c
...
...
@@ -81,21 +81,43 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
@ExcelProperty
(
"身份证号"
)
private
String
empIdcard
;
/**
*
客户名称
*
项目id
*/
@
Length
(
max
=
50
,
message
=
"客户名称 不能超过50 个字符
"
)
@
ExcelAttribute
(
name
=
"客户名称"
,
maxLength
=
50
)
@
Schema
(
description
=
"客户名称
"
)
@ExcelProperty
(
"客户名称"
)
private
String
unitId
;
@
ExcelAttribute
(
name
=
"项目id
"
)
@
Schema
(
description
=
"项目id"
)
@
ExcelProperty
(
"项目id
"
)
private
String
settleDomainId
;
/**
* 项目名称
*/
@Length
(
max
=
50
,
message
=
"项目名称 不能超过50 个字符"
)
@ExcelAttribute
(
name
=
"项目名称"
,
maxLength
=
50
)
@Schema
(
description
=
"项目名称"
)
@Schema
(
description
=
"项目名称"
)
@ExcelProperty
(
"项目名称"
)
private
String
settleDomainId
;
private
String
settleDomainName
;
/**
* 项目编码
*/
@ExcelAttribute
(
name
=
"项目编码"
,
maxLength
=
50
)
@Schema
(
description
=
"项目编码"
)
@ExcelProperty
(
"项目编码"
)
private
String
settleDomainCode
;
/**
* 客户名称
*/
@ExcelAttribute
(
name
=
"客户名称"
,
maxLength
=
50
)
@Schema
(
description
=
"客户名称"
)
@ExcelProperty
(
"客户名称"
)
private
String
unitName
;
/**
* 客户Id
*/
@ExcelAttribute
(
name
=
"客户Id"
)
@Schema
(
description
=
"客户Id"
)
@ExcelProperty
(
"客户Id"
)
private
String
unitId
;
/**
* 社保户
*/
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
cb2eb69c
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
cb2eb69c
...
...
@@ -925,8 +925,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo
.
setEmpId
(
socialInfo
.
getEmpId
());
paymentInfo
.
setEmpIdcard
(
socialInfo
.
getEmpIdcard
());
paymentInfo
.
setEmpName
(
socialInfo
.
getEmpName
());
paymentInfo
.
setSettleDomainId
(
socialInfo
.
getSettleDomainName
());
paymentInfo
.
setUnitId
(
socialInfo
.
getUnitName
());
paymentInfo
.
setSettleDomainId
(
socialInfo
.
getSettleDomain
());
paymentInfo
.
setSettleDomainName
(
socialInfo
.
getSettleDomainName
());
paymentInfo
.
setSettleDomainCode
(
socialInfo
.
getSettleDomainCode
());
paymentInfo
.
setUnitId
(
socialInfo
.
getUnitId
());
paymentInfo
.
setUnitName
(
socialInfo
.
getUnitName
());
if
(
Common
.
isNotNull
(
tSocialInfo
))
{
paymentInfo
.
setInauguralTeam
(
tSocialInfo
.
getInauguralTeam
());
paymentInfo
.
setEmpNo
(
tSocialInfo
.
getEmpNo
());
...
...
@@ -1362,7 +1365,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo
.
setEmpIdcard
(
fund
.
getEmpIdcard
());
paymentInfo
.
setEmpName
(
fund
.
getEmpName
());
paymentInfo
.
setSettleDomainId
(
fund
.
getSettleDomainNameFund
());
paymentInfo
.
setUnitId
(
fund
.
getUnitNameFund
());
paymentInfo
.
setSettleDomainName
(
fund
.
getSettleDomainNameFund
());
paymentInfo
.
setSettleDomainCode
(
fund
.
getSettleDomainCodeFund
());
paymentInfo
.
setUnitId
(
fund
.
getUnitIdFund
());
paymentInfo
.
setUnitName
(
fund
.
getUnitNameFund
());
if
(
Common
.
isNotNull
(
tProvidentFund
))
{
paymentInfo
.
setInauguralTeam
(
tProvidentFund
.
getInauguralTeam
());
paymentInfo
.
setEmpNo
(
tProvidentFund
.
getEmpNo
());
...
...
@@ -1902,8 +1909,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
payExists
.
setEmpId
(
socialInfo
.
getEmpId
());
payExists
.
setEmpIdcard
(
socialInfo
.
getEmpIdcard
());
payExists
.
setEmpName
(
socialInfo
.
getEmpName
());
payExists
.
setSettleDomainId
(
socialInfo
.
getSettleDomainName
());
payExists
.
setUnitId
(
socialInfo
.
getUnitName
());
payExists
.
setSettleDomainId
(
socialInfo
.
getSettleDomain
());
payExists
.
setSettleDomainName
(
socialInfo
.
getSettleDomainName
());
payExists
.
setSettleDomainCode
(
socialInfo
.
getSettleDomainCode
());
payExists
.
setUnitId
(
socialInfo
.
getUnitId
());
payExists
.
setUnitName
(
socialInfo
.
getUnitName
());
if
(
Common
.
isNotNull
(
tSocialInfo
))
{
payExists
.
setInauguralTeam
(
tSocialInfo
.
getInauguralTeam
());
payExists
.
setEmpNo
(
tSocialInfo
.
getEmpNo
());
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
cb2eb69c
...
...
@@ -29,6 +29,9 @@
<result
property=
"empId"
column=
"EMP_ID"
/>
<result
property=
"empIdcard"
column=
"EMP_IDCARD"
/>
<result
property=
"unitId"
column=
"UNIT_ID"
/>
<result
property=
"unitName"
column=
"UNIT_NAME"
/>
<result
property=
"settleDomainName"
column=
"SETTLE_DOMAIN_NAME"
/>
<result
property=
"settleDomainCode"
column=
"SETTLE_DOMAIN_CODE"
/>
<result
property=
"settleDomainId"
column=
"SETTLE_DOMAIN_ID"
/>
<result
property=
"socialHousehold"
column=
"SOCIAL_HOUSEHOLD"
/>
<result
property=
"socialSecurityNo"
column=
"SOCIAL_SECURITY_NO"
/>
...
...
@@ -109,6 +112,9 @@
a.EMP_ID,
a.EMP_IDCARD,
a.UNIT_ID,
a.UNIT_NAME,
a.SETTLE_DOMAIN_CODE,
a.SETTLE_DOMAIN_NAME,
a.SETTLE_DOMAIN_ID,
a.SOCIAL_HOUSEHOLD,
a.SOCIAL_SECURITY_NO,
...
...
@@ -192,6 +198,9 @@
a.EMP_ID,
a.EMP_IDCARD,
a.UNIT_ID,
a.UNIT_NAME,
a.SETTLE_DOMAIN_CODE,
a.SETTLE_DOMAIN_NAME,
a.SETTLE_DOMAIN_ID,
a.SOCIAL_HOUSEHOLD,
a.SOCIAL_SECURITY_NO,
...
...
@@ -283,6 +292,15 @@
<if
test=
"tPaymentInfo.unitId != null and tPaymentInfo.unitId.trim() != ''"
>
AND a.UNIT_ID = #{tPaymentInfo.unitId}
</if>
<if
test=
"tPaymentInfo.settleDomainName != null and tPaymentInfo.settleDomainName.trim() != ''"
>
AND a.SETTLE_DOMAIN_NAME = #{tPaymentInfo.settleDomainName}
</if>
<if
test=
"tPaymentInfo.settleDomainCode != null and tPaymentInfo.settleDomainCode.trim() != ''"
>
AND a.SETTLE_DOMAIN_CODE = #{tPaymentInfo.settleDomainCode}
</if>
<if
test=
"tPaymentInfo.unitName != null and tPaymentInfo.unitName.trim() != ''"
>
AND a.UNIT_NAME = #{tPaymentInfo.unitName}
</if>
<if
test=
"tPaymentInfo.settleDomainId != null and tPaymentInfo.settleDomainId.trim() != ''"
>
AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
</if>
...
...
@@ -296,10 +314,10 @@
AND a.SOCIAL_PAY_ADDR = #{tPaymentInfo.socialPayAddr}
</if>
<if
test=
"tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''"
>
AND
a.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth}
AND
(a.SOCIAL_PAY_MONTH = '${tPaymentInfo.socialPayMonth}' or a.PROVIDENT_PAY_MONTH = '${tPaymentInfo.socialPayMonth}')
</if>
<if
test=
"tPaymentInfo.socialCreateMonth != null and tPaymentInfo.socialCreateMonth.trim() != ''"
>
AND
a.SOCIAL_CREATE_MONTH = #{tPaymentInfo.socialCreateMonth}
AND
(a.SOCIAL_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}' or a.PROVIDENT_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}')
</if>
<if
test=
"tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''"
>
AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
...
...
@@ -310,12 +328,6 @@
<if
test=
"tPaymentInfo.sumAll != null"
>
AND a.SUM_ALL = #{tPaymentInfo.sumAll}
</if>
<if
test=
"tPaymentInfo.providentPayMonth != null and tPaymentInfo.providentPayMonth.trim() != ''"
>
AND a.PROVIDENT_PAY_MONTH = #{tPaymentInfo.providentPayMonth}
</if>
<if
test=
"tPaymentInfo.providentCreateMonth != null and tPaymentInfo.providentCreateMonth.trim() != ''"
>
AND a.PROVIDENT_CREATE_MONTH = #{tPaymentInfo.providentCreateMonth}
</if>
<if
test=
"tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"
>
AND a.PROVIDENT_HOUSEHOLD like CONCAT(#{tPaymentInfo.providentHousehold},'%')
</if>
...
...
@@ -524,6 +536,15 @@
<if
test=
"tPaymentInfo.unitId != null and tPaymentInfo.unitId.trim() != ''"
>
AND a.UNIT_ID = #{tPaymentInfo.unitId}
</if>
<if
test=
"tPaymentInfo.settleDomainName != null and tPaymentInfo.settleDomainName.trim() != ''"
>
AND a.SETTLE_DOMAIN_NAME = #{tPaymentInfo.settleDomainName}
</if>
<if
test=
"tPaymentInfo.settleDomainCode != null and tPaymentInfo.settleDomainCode.trim() != ''"
>
AND a.SETTLE_DOMAIN_CODE = #{tPaymentInfo.settleDomainCode}
</if>
<if
test=
"tPaymentInfo.unitName != null and tPaymentInfo.unitName.trim() != ''"
>
AND a.UNIT_NAME = #{tPaymentInfo.unitName}
</if>
<if
test=
"tPaymentInfo.settleDomainId != null and tPaymentInfo.settleDomainId.trim() != ''"
>
AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
</if>
...
...
@@ -537,10 +558,10 @@
AND a.SOCIAL_PAY_ADDR = #{tPaymentInfo.socialPayAddr}
</if>
<if
test=
"tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''"
>
AND
a.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth}
AND
(a.SOCIAL_PAY_MONTH = '${tPaymentInfo.socialPayMonth}' or a.PROVIDENT_PAY_MONTH = '${tPaymentInfo.socialPayMonth}')
</if>
<if
test=
"tPaymentInfo.socialCreateMonth != null and tPaymentInfo.socialCreateMonth.trim() != ''"
>
AND
a.SOCIAL_CREATE_MONTH = #{tPaymentInfo.socialCreateMonth}
AND
(a.SOCIAL_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}' or a.PROVIDENT_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}')
</if>
<if
test=
"tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''"
>
AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
...
...
@@ -548,12 +569,6 @@
<if
test=
"tPaymentInfo.sumAll != null"
>
AND a.SUM_ALL = #{tPaymentInfo.sumAll}
</if>
<if
test=
"tPaymentInfo.providentPayMonth != null and tPaymentInfo.providentPayMonth.trim() != ''"
>
AND a.PROVIDENT_PAY_MONTH = #{tPaymentInfo.providentPayMonth}
</if>
<if
test=
"tPaymentInfo.providentCreateMonth != null and tPaymentInfo.providentCreateMonth.trim() != ''"
>
AND a.PROVIDENT_CREATE_MONTH = #{tPaymentInfo.providentCreateMonth}
</if>
<if
test=
"tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"
>
AND a.PROVIDENT_HOUSEHOLD like CONCAT(#{tPaymentInfo.providentHousehold},'%')
</if>
...
...
@@ -753,6 +768,9 @@
<result
property=
"empId"
column=
"EMP_ID"
/>
<result
property=
"empIdcard"
column=
"EMP_IDCARD"
/>
<result
property=
"unitId"
column=
"UNIT_ID"
/>
<result
property=
"unitName"
column=
"UNIT_NAME"
/>
<result
property=
"settleDomainName"
column=
"SETTLE_DOMAIN_NAME"
/>
<result
property=
"settleDomainCode"
column=
"SETTLE_DOMAIN_CODE"
/>
<result
property=
"settleDomainId"
column=
"SETTLE_DOMAIN_ID"
/>
<result
property=
"socialHousehold"
column=
"SOCIAL_HOUSEHOLD"
/>
<result
property=
"socialSecurityNo"
column=
"SOCIAL_SECURITY_NO"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment