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
694c9364
Commit
694c9364
authored
Oct 19, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop'
parents
e2cc8c08
1ba63982
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
259 additions
and
163 deletions
+259
-163
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+2
-2
TEmployeeInfo.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
+2
-2
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+2
-2
EmpAddDispatchVo.java
...yifu/cloud/plus/v1/yifu/archives/vo/EmpAddDispatchVo.java
+2
-2
EmployeeContractExportVO.java
...ud/plus/v1/yifu/archives/vo/EmployeeContractExportVO.java
+1
-1
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+35
-41
DoJointTask.java
...m/yifu/cloud/plus/v1/yifu/archives/utils/DoJointTask.java
+3
-1
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+82
-83
TSalaryAccount.java
...yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java
+61
-0
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+33
-19
TSalaryAccountMapper.xml
...ry-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
+28
-2
TForecastLibrary.java
...fu/cloud/plus/v1/yifu/social/entity/TForecastLibrary.java
+3
-3
TForecastLibraryVo.java
...yifu/cloud/plus/v1/yifu/social/vo/TForecastLibraryVo.java
+5
-5
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
694c9364
...
...
@@ -405,10 +405,10 @@ public class TEmployeeContractInfo extends BaseEntity {
private
String
auditRemark
;
/**
* 员工类型(字典值,0外包1派遣2代理)
* 员工类型(字典值,0外包1派遣2代理
3内部员工
)
*/
@ExcelAttribute
(
name
=
"员工类型"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_NATRUE
)
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理)"
)
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理
3内部员工
)"
)
@Size
(
max
=
1
,
message
=
"员工类型不可超过1位"
)
private
String
empNatrue
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
View file @
694c9364
...
...
@@ -59,10 +59,10 @@ public class TEmployeeInfo extends BaseEntity {
private
String
empCode
;
/**
* 员工类型(字典值,0外包1派遣2代理)
* 员工类型(字典值,0外包1派遣2代理
3内部员工
)
*/
@ExcelAttribute
(
name
=
"员工类型"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_NATRUE
)
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理)"
)
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理
3内部员工
)"
)
@NotNull
(
message
=
"员工类型不可为空"
)
@Size
(
max
=
1
,
message
=
"员工类型不可超过1位"
)
private
String
empNatrue
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
694c9364
...
...
@@ -66,9 +66,9 @@ public class TEmployeeProject extends BaseEntity {
private
String
empCode
;
/**
* 员工类型(字典值,0外包1派遣2代理)
* 员工类型(字典值,0外包1派遣2代理
3内部员工
)
*/
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理)"
)
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理
3内部员工
)"
)
@NotNull
(
message
=
"员工类型不能为空"
)
@Size
(
max
=
1
,
message
=
"员工类型不可超过1位"
)
private
String
empNatrue
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpAddDispatchVo.java
View file @
694c9364
...
...
@@ -22,10 +22,10 @@ public class EmpAddDispatchVo extends TEmployeeInfo {
/**
* 员工类型(字典值,0外包1派遣2代理)
* 员工类型(字典值,0外包1派遣2代理
3内部员工
)
*/
@ExcelAttribute
(
name
=
"员工类型"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_NATRUE
)
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理)"
)
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理
3内部员工
)"
)
private
String
empNatrue
;
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractExportVO.java
View file @
694c9364
...
...
@@ -117,7 +117,7 @@ public class EmployeeContractExportVO implements Serializable {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"员工类型"
)
@ExcelAttribute
(
name
=
"员工类型"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_NATRUE
)
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理)"
)
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理
3内部员工
)"
)
private
String
empNatrue
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
694c9364
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoJointTask.java
View file @
694c9364
...
...
@@ -57,7 +57,9 @@ public class DoJointTask {
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
));
if
(
Common
.
isNotNull
(
list
))
{
Set
<
String
>
empNatrue
=
list
.
stream
().
map
(
TEmployeeProject:
:
getEmpNatrue
).
collect
(
Collectors
.
toSet
());
if
(
empNatrue
.
stream
().
anyMatch
(
e
->
e
.
equals
(
CommonConstants
.
ZERO_STRING
)))
{
if
(
empNatrue
.
stream
().
anyMatch
(
e
->
e
.
equals
(
CommonConstants
.
THREE_STRING
)))
{
tEmployeeInfo
.
setEmpNatrue
(
CommonConstants
.
THREE_STRING
);
}
else
if
(
empNatrue
.
stream
().
anyMatch
(
e
->
e
.
equals
(
CommonConstants
.
ZERO_STRING
)))
{
tEmployeeInfo
.
setEmpNatrue
(
CommonConstants
.
ZERO_STRING
);
}
else
if
(
empNatrue
.
stream
().
anyMatch
(
e
->
e
.
equals
(
CommonConstants
.
ONE_STRING
)))
{
tEmployeeInfo
.
setEmpNatrue
(
CommonConstants
.
ONE_STRING
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
694c9364
...
...
@@ -1670,98 +1670,97 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detailList
.
add
(
detail
);
try
{
if
(
detail
.
getBuyType
()
!=
CommonConstants
.
FOUR_INT
&&
CommonConstants
.
ONE_INT
==
detail
.
getSettleType
())
{
if
(
new
BigDecimal
(
success
.
getActualPremium
()).
compareTo
(
actualMoney
)
!=
0
)
{
//获取项目信息
TSettleDomain
settleDomain
=
new
TSettleDomain
();
List
<
TSettleDomainSelectVo
>
settleDomainR
=
null
;
R
<
TSettleDomainListVo
>
listVo
=
null
;
listVo
=
archivesDaprUtil
.
selectSettleDomainSelectVoByNo
(
detail
.
getDeptNo
());
if
(
Common
.
isNotNull
(
listVo
))
{
TSettleDomainListVo
tSettleDomainListVo
=
listVo
.
getData
();
if
(
Common
.
isNotNull
(
tSettleDomainListVo
)
&&
Common
.
isNotEmpty
(
tSettleDomainListVo
.
getListSelectVO
()))
{
settleDomainR
=
tSettleDomainListVo
.
getListSelectVO
();
for
(
TSettleDomainSelectVo
vo
:
settleDomainR
)
{
BeanUtils
.
copyProperties
(
vo
,
settleDomain
);
}
CommonConstants
.
ONE_INT
==
detail
.
getSettleType
()
&&
new
BigDecimal
(
success
.
getActualPremium
()).
compareTo
(
actualMoney
)
!=
0
)
{
//获取项目信息
TSettleDomain
settleDomain
=
new
TSettleDomain
();
List
<
TSettleDomainSelectVo
>
settleDomainR
=
null
;
R
<
TSettleDomainListVo
>
listVo
=
null
;
listVo
=
archivesDaprUtil
.
selectSettleDomainSelectVoByNo
(
detail
.
getDeptNo
());
if
(
Common
.
isNotNull
(
listVo
))
{
TSettleDomainListVo
tSettleDomainListVo
=
listVo
.
getData
();
if
(
Common
.
isNotNull
(
tSettleDomainListVo
)
&&
Common
.
isNotEmpty
(
tSettleDomainListVo
.
getListSelectVO
()))
{
settleDomainR
=
tSettleDomainListVo
.
getListSelectVO
();
for
(
TSettleDomainSelectVo
vo
:
settleDomainR
)
{
BeanUtils
.
copyProperties
(
vo
,
settleDomain
);
}
}
BigDecimal
gMoney
=
BigDecimal
.
ZERO
;
Boolean
isBl
=
false
;
if
(
Common
.
isNotNull
(
settleDomain
))
{
// 含有商险,则计算收入
if
(
settleDomain
.
getMrSettleType
().
equals
(
CommonConstants
.
TWO_STRING
))
{
if
(
Common
.
isNotNull
(
settleDomain
.
getManageServerItem
())
&&
settleDomain
.
getManageServerItem
()
.
contains
(
CommonConstants
.
THREE_STRING
)
&&
CommonConstants
.
ZERO_STRING
.
equals
(
settleDomain
.
getManagementTag
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
settleDomain
.
getManagementType
()))
{
gMoney
=
BigDecimalUtils
.
safeMultiply
(
actualMoney
,
settleDomain
.
getManagementFee
().
divide
(
new
BigDecimal
(
"100"
),
CommonConstants
.
FIVE_INT
,
BigDecimal
.
ROUND_HALF_UP
));
isBl
=
true
;
}
//判断是否存在当月的商险收入数据
TIncomeDetail
incomeDetail
=
new
TIncomeDetail
();
incomeDetail
.
setSourceId
(
detail
.
getId
());
if
(
isBl
)
{
incomeDetail
.
setMoney
(
gMoney
);
}
else
{
incomeDetail
.
setMoney
(
actualMoney
);
}
incomeDetail
.
setFeeType
(
CommonConstants
.
ONE_STRING
);
//判断是否存在当月的商险收入数据
R
<
TIncomeDetailReturnVo
>
detailInfoList
=
socialDaprUtils
.
getTIncomeDetailList
(
incomeDetail
);
if
(
Common
.
isNotNull
(
detailInfoList
)
&&
detailInfoList
.
getCode
()
==
CommonConstants
.
SUCCESS
&&
detailInfoList
.
getData
().
getDetailList
().
size
()
>
0
)
{
//生成红冲数据
for
(
TIncomeDetail
detailInfo
:
detailInfoList
.
getData
().
getDetailList
())
{
TIncomeDetail
detail1
=
new
TIncomeDetail
();
BeanCopyUtils
.
copyProperties
(
detailInfo
,
detail1
);
detail1
.
setId
(
CommonConstants
.
NULL
);
detail1
.
setRedData
(
CommonConstants
.
ONE_STRING
);
detail1
.
setMoney
(
detailInfo
.
getMoney
().
negate
());
socialDaprUtils
.
createTIncomeDetail
(
detail1
);
break
;
}
}
}
BigDecimal
gMoney
=
BigDecimal
.
ZERO
;
boolean
isBl
=
false
;
if
(
Common
.
isNotNull
(
settleDomain
))
{
// 含有商险,则计算收入
if
(
settleDomain
.
getMrSettleType
().
equals
(
CommonConstants
.
TWO_STRING
))
{
if
(
Common
.
isNotNull
(
settleDomain
.
getManageServerItem
())
&&
settleDomain
.
getManageServerItem
()
.
contains
(
CommonConstants
.
THREE_STRING
)
&&
CommonConstants
.
ZERO_STRING
.
equals
(
settleDomain
.
getManagementTag
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
settleDomain
.
getManagementType
()))
{
gMoney
=
BigDecimalUtils
.
safeMultiply
(
actualMoney
,
settleDomain
.
getManagementFee
().
divide
(
new
BigDecimal
(
"100"
),
CommonConstants
.
FIVE_INT
,
BigDecimal
.
ROUND_HALF_UP
));
isBl
=
true
;
}
if
(
Common
.
isNotNull
(
settleDomain
.
getRiskServerItem
())
&&
settleDomain
.
getRiskServerItem
()
.
contains
(
CommonConstants
.
THREE_STRING
)
&&
CommonConstants
.
ZERO_STRING
.
equals
(
settleDomain
.
getRiskFundTag
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
settleDomain
.
getRiskFundType
()))
{
gMoney
=
BigDecimalUtils
.
safeMultiply
(
actualMoney
,
settleDomain
.
getRiskFundFee
().
divide
(
new
BigDecimal
(
"100"
),
CommonConstants
.
FIVE_INT
,
BigDecimal
.
ROUND_HALF_UP
));
isBl
=
true
;
}
//判断是否存在当月的商险收入数据
TIncomeDetail
incomeDetail
=
new
TIncomeDetail
();
incomeDetail
.
setSourceId
(
detail
.
getId
());
incomeDetail
.
setFeeType
(
CommonConstants
.
TWO_STRING
);
if
(
isBl
)
{
incomeDetail
.
setMoney
(
gMoney
);
}
else
{
incomeDetail
.
setMoney
(
actualMoney
);
//判断是否存在当月的商险收入数据
TIncomeDetail
incomeDetail
=
new
TIncomeDetail
();
incomeDetail
.
setSourceId
(
detail
.
getId
());
if
(
isBl
)
{
incomeDetail
.
setMoney
(
gMoney
);
}
else
{
incomeDetail
.
setMoney
(
actualMoney
);
}
incomeDetail
.
setFeeType
(
CommonConstants
.
ONE_STRING
);
//判断是否存在当月的商险收入数据
R
<
TIncomeDetailReturnVo
>
detailInfoList
=
socialDaprUtils
.
getTIncomeDetailList
(
incomeDetail
);
if
(
Common
.
isNotNull
(
detailInfoList
)
&&
detailInfoList
.
getCode
()
==
CommonConstants
.
SUCCESS
&&
!
detailInfoList
.
getData
().
getDetailList
().
isEmpty
())
{
//生成红冲数据
for
(
TIncomeDetail
detailInfo
:
detailInfoList
.
getData
().
getDetailList
())
{
TIncomeDetail
detail1
=
new
TIncomeDetail
();
BeanCopyUtils
.
copyProperties
(
detailInfo
,
detail1
);
detail1
.
setId
(
CommonConstants
.
NULL
);
detail1
.
setRedData
(
CommonConstants
.
ONE_STRING
);
detail1
.
setMoney
(
detailInfo
.
getMoney
().
negate
());
socialDaprUtils
.
createTIncomeDetail
(
detail1
);
break
;
}
//判断是否存在当月的商险收入数据
R
<
TIncomeDetailReturnVo
>
detailInfoList
=
socialDaprUtils
.
getTIncomeDetailList
(
incomeDetail
);
if
(
Common
.
isNotNull
(
detailInfoList
)
&&
detailInfoList
.
getCode
()
==
CommonConstants
.
SUCCESS
&&
detailInfoList
.
getData
().
getDetailList
().
size
()
>
0
)
{
//生成红冲数据
for
(
TIncomeDetail
detailInfo
:
detailInfoList
.
getData
().
getDetailList
())
{
TIncomeDetail
detail1
=
new
TIncomeDetail
();
BeanCopyUtils
.
copyProperties
(
detailInfo
,
detail1
);
detail1
.
setId
(
CommonConstants
.
NULL
);
detail1
.
setRedData
(
CommonConstants
.
ONE_STRING
);
detail1
.
setMoney
(
detailInfo
.
getMoney
().
negate
());
socialDaprUtils
.
createTIncomeDetail
(
detail1
);
break
;
}
}
}
if
(
Common
.
isNotNull
(
settleDomain
.
getRiskServerItem
())
&&
settleDomain
.
getRiskServerItem
()
.
contains
(
CommonConstants
.
THREE_STRING
)
&&
CommonConstants
.
ZERO_STRING
.
equals
(
settleDomain
.
getRiskFundTag
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
settleDomain
.
getRiskFundType
()))
{
gMoney
=
BigDecimalUtils
.
safeMultiply
(
actualMoney
,
settleDomain
.
getRiskFundFee
().
divide
(
new
BigDecimal
(
"100"
),
CommonConstants
.
FIVE_INT
,
BigDecimal
.
ROUND_HALF_UP
));
isBl
=
true
;
}
//判断是否存在当月的商险收入数据
TIncomeDetail
incomeDetail
=
new
TIncomeDetail
();
incomeDetail
.
setSourceId
(
detail
.
getId
());
incomeDetail
.
setFeeType
(
CommonConstants
.
TWO_STRING
);
if
(
isBl
)
{
incomeDetail
.
setMoney
(
gMoney
);
}
else
{
incomeDetail
.
setMoney
(
actualMoney
);
}
//判断是否存在当月的商险收入数据
R
<
TIncomeDetailReturnVo
>
detailInfoList
=
socialDaprUtils
.
getTIncomeDetailList
(
incomeDetail
);
if
(
Common
.
isNotNull
(
detailInfoList
)
&&
detailInfoList
.
getCode
()
==
CommonConstants
.
SUCCESS
&&
!
detailInfoList
.
getData
().
getDetailList
().
isEmpty
())
{
//生成红冲数据
for
(
TIncomeDetail
detailInfo
:
detailInfoList
.
getData
().
getDetailList
())
{
TIncomeDetail
detail1
=
new
TIncomeDetail
();
BeanCopyUtils
.
copyProperties
(
detailInfo
,
detail1
);
detail1
.
setId
(
CommonConstants
.
NULL
);
detail1
.
setRedData
(
CommonConstants
.
ONE_STRING
);
detail1
.
setMoney
(
detailInfo
.
getMoney
().
negate
());
socialDaprUtils
.
createTIncomeDetail
(
detail1
);
break
;
}
}
}
}
//生成收入数据
createInsuranceInfo
(
detail
);
}
//生成收入数据
createInsuranceInfo
(
detail
);
}
}
catch
(
Exception
e
){
log
.
error
(
"收入数据同步处理失败:"
+
e
);
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java
View file @
694c9364
...
...
@@ -445,4 +445,65 @@ public class TSalaryAccount extends BaseEntity {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"订单ID"
)
private
String
orderId
;
@ExcelAttribute
(
name
=
"单位社保"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"单位社保"
)
private
BigDecimal
unitSocial
;
@ExcelAttribute
(
name
=
"个人社保"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"个人社保"
)
private
BigDecimal
personSocial
;
@ExcelAttribute
(
name
=
"单位公积金"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"单位公积金"
)
private
BigDecimal
unitFund
;
@ExcelAttribute
(
name
=
"个人公积金"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"个人公积金"
)
private
BigDecimal
personFund
;
@ExcelAttribute
(
name
=
"减除费用"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"减除费用"
)
private
BigDecimal
costReduction
;
// 累计子女教育 累计继续教育 累计住房贷款利息 累计住房租金 累计赡养老人 累计3岁以下婴幼儿照护
@ExcelAttribute
(
name
=
"累计子女教育"
,
isFloat
=
true
,
max
=
"999999999.99"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"累计子女教育"
)
private
BigDecimal
sumChildEduMoney
;
@ExcelAttribute
(
name
=
"累计继续教育"
,
isFloat
=
true
,
max
=
"999999999.99"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"累计继续教育"
)
private
BigDecimal
sumContinuingEducationMoney
;
@ExcelAttribute
(
name
=
"累计住房贷款利息"
,
isFloat
=
true
,
max
=
"999999999.99"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"累计住房贷款利息"
)
private
BigDecimal
sumHousingLoanMoney
;
@ExcelAttribute
(
name
=
"累计住房租金"
,
isFloat
=
true
,
max
=
"999999999.99"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"累计住房租金"
)
private
BigDecimal
sumHousingRentMoney
;
@ExcelAttribute
(
name
=
"累计赡养老人"
,
isFloat
=
true
,
max
=
"999999999.99"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"累计赡养老人"
)
private
BigDecimal
sumSupportElderlyMoney
;
@ExcelAttribute
(
name
=
"累计3岁以下婴幼儿照护"
,
isFloat
=
true
,
max
=
"999999999.99"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"累计3岁以下婴幼儿照护"
)
private
BigDecimal
sumBabyMoney
;
@ExcelAttribute
(
name
=
"年终奖单独扣税税费"
,
isFloat
=
true
,
max
=
"999999999.99"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"年终奖单独扣税税费"
)
private
BigDecimal
annualBonusTax
;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
694c9364
This diff is collapsed.
Click to expand it.
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @
694c9364
...
...
@@ -78,6 +78,20 @@
<result
property=
"sendUserName"
column=
"SEND_USER_NAME"
/>
<result
property=
"sendMonth"
column=
"SEND_MONTH"
/>
<result
property=
"orderId"
column=
"ORDER_ID"
/>
<result
property=
"unitSocial"
column=
"UNIT_SOCIAL"
/>
<result
property=
"personSocial"
column=
"PERSON_SOCIAL"
/>
<result
property=
"unitFund"
column=
"UNIT_FUND"
/>
<result
property=
"personFund"
column=
"PERSON_FUND"
/>
<result
property=
"costReduction"
column=
"COST_REDUCTION"
/>
<result
property=
"annualBonusTax"
column=
"ANNUAL_BONUS_TAX"
/>
<result
property=
"sumChildEduMoney"
column=
"SUM_CHILD_EDU_MONEY"
/>
<result
property=
"sumHousingLoanMoney"
column=
"SUM_HOUSING_LOAN_MONEY"
/>
<result
property=
"sumHousingRentMoney"
column=
"SUM_HOUSING_RENT_MONEY"
/>
<result
property=
"sumSupportElderlyMoney"
column=
"SUM_SUPPORT_ELDERLY_MONEY"
/>
<result
property=
"sumContinuingEducationMoney"
column=
"SUM_CONTINUING_EDUCATION_MONEY"
/>
<result
property=
"sumBabyMoney"
column=
"SUM_BABY_MONEY"
/>
</resultMap>
<!-- 对接EKP的参数 -->
...
...
@@ -208,8 +222,20 @@
a.SEND_USER,
a.SEND_USER_NAME,
a.SEND_MONTH,
a.ORDER_ID
</sql>
a.ORDER_ID,
a.UNIT_SOCIAL,
a.PERSON_SOCIAL,
a.UNIT_FUND,
a.PERSON_FUND,
a.COST_REDUCTION,
a.ANNUAL_BONUS_TAX,
a.SUM_CHILD_EDU_MONEY,
a.SUM_HOUSING_LOAN_MONEY,
a.SUM_HOUSING_RENT_MONEY,
a.SUM_SUPPORT_ELDERLY_MONEY,
a.SUM_CONTINUING_EDUCATION_MONEY,
a.SUM_BABY_MONEY
</sql>
<sql
id=
"tSalaryAccount_where"
>
<if
test=
"tSalaryAccount != null"
>
<if
test=
"tSalaryAccount.id != null and tSalaryAccount.id.trim() != ''"
>
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TForecastLibrary.java
View file @
694c9364
...
...
@@ -515,10 +515,10 @@ public class TForecastLibrary extends BaseEntity {
/**
* 员工类型(字典值,0外包1派遣2代理)
*/
@ExcelAttribute
(
name
=
"员工类型(字典值,0外包1派遣2代理)"
,
maxLength
=
1
)
@Length
(
max
=
1
,
message
=
"员工类型(字典值,0外包1派遣2代理)不能超过1个字符"
)
@ExcelAttribute
(
name
=
"员工类型(字典值,0外包1派遣2代理
3内部员工
)"
,
maxLength
=
1
)
@Length
(
max
=
1
,
message
=
"员工类型(字典值,0外包1派遣2代理
3内部员工
)不能超过1个字符"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"员工类型(字典值,0外包1派遣2代理)"
)
@ExcelProperty
(
"员工类型(字典值,0外包1派遣2代理
3内部员工
)"
)
private
String
empNatrue
;
/**
* 单位补缴利息
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TForecastLibraryVo.java
View file @
694c9364
...
...
@@ -554,13 +554,13 @@ public class TForecastLibraryVo extends RowIndex implements Serializable {
@ExcelProperty
(
"项目名称"
)
private
String
deptName
;
/**
* 员工类型(字典值,0外包1派遣2代理)
* 员工类型(字典值,0外包1派遣2代理
3内部员工
)
*/
@Length
(
max
=
1
,
message
=
"员工类型(字典值,0外包1派遣2代理) 不能超过1 个字符"
)
@ExcelAttribute
(
name
=
"员工类型(字典值,0外包1派遣2代理)"
,
maxLength
=
1
)
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理)"
)
@Length
(
max
=
1
,
message
=
"员工类型(字典值,0外包1派遣2代理
3内部员工
) 不能超过1 个字符"
)
@ExcelAttribute
(
name
=
"员工类型(字典值,0外包1派遣2代理
3内部员工
)"
,
maxLength
=
1
)
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理
3内部员工
)"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"员工类型(字典值,0外包1派遣2代理)"
)
@ExcelProperty
(
"员工类型(字典值,0外包1派遣2代理
3内部员工
)"
)
private
String
empNatrue
;
/**
* 单位补缴利息
...
...
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