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
1ba63982
Commit
1ba63982
authored
Oct 19, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商险优化
parent
1ec1f9d0
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
137 additions
and
142 deletions
+137
-142
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
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 @
1ba63982
...
...
@@ -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 @
1ba63982
...
...
@@ -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 @
1ba63982
...
...
@@ -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 @
1ba63982
...
...
@@ -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 @
1ba63982
...
...
@@ -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 @
1ba63982
...
...
@@ -130,15 +130,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(!
Common
.
isEmpty
(
employeeProject
))
{
//身份证实名认证
if
(!
Common
.
isEmpty
(
tEmployeeInfo
))
{
if
(!
tEmployeeProject
.
getEmpName
().
equals
(
tEmployeeInfo
.
getEmpName
()))
{
if
(!
Common
.
isEmpty
(
tEmployeeInfo
)
&&
!
tEmployeeProject
.
getEmpName
().
equals
(
tEmployeeInfo
.
getEmpName
()))
{
return
R
.
failed
(
"姓名和身份证不一致,请确认后再次新增"
);
}
}
//项目状态为已减项
if
(
CommonConstants
.
dingleDigitIntArray
[
1
]
==
employeeProject
.
getProjectStatus
()
)
{
if
(
!
Common
.
isEmpty
(
tEmployeeInfo
))
{
if
(
CommonConstants
.
dingleDigitIntArray
[
1
]
==
employeeProject
.
getProjectStatus
()
&&
!
Common
.
isEmpty
(
tEmployeeInfo
))
{
map
.
put
(
"empProId"
,
employeeProject
.
getId
());
if
(
CommonConstants
.
dingleDigitIntArray
[
0
]
==
tEmployeeInfo
.
getFileStatus
())
{
return
new
R
<>(
CommonConstants
.
dingleDigitIntArray
[
4
],
"该人员已减项,是否“复项”"
,
map
);
...
...
@@ -147,7 +145,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return
new
R
<>(
CommonConstants
.
dingleDigitIntArray
[
2
],
"该人员已减档减项,是否“复档复项”"
,
map
);
}
}
}
//状态为草稿、已审核
if
(
CommonConstants
.
dingleDigitIntArray
[
0
]
==
employeeProject
.
getStatus
()
||
CommonConstants
.
dingleDigitIntArray
[
1
]
==
employeeProject
.
getStatus
())
{
...
...
@@ -194,7 +191,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return
R
.
failed
(
EmployeeConstants
.
CHECK_NO_RESPONSE
);
}
else
if
(!
CommonConstants
.
SUCCESS
.
equals
(
vo
.
getRes
().
getCode
()))
{
return
R
.
failed
(
vo
.
getRes
().
getMsg
());
}
else
if
(
!
Common
.
isEmpty
(
check
)
&&
!
check
.
getResult
().
equals
(
CommonConstants
.
ZERO_ONE
))
{
}
else
if
(
null
!=
check
&&
!
check
.
getResult
().
equals
(
CommonConstants
.
ZERO_ONE
))
{
return
R
.
failed
(
check
.
getRemark
());
}
}
else
{
...
...
@@ -255,7 +252,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return
R
.
failed
(
EmployeeConstants
.
CHECK_NO_RESPONSE
);
}
else
if
(!
CommonConstants
.
SUCCESS
.
equals
(
vo
.
getRes
().
getCode
()))
{
return
R
.
failed
(
vo
.
getRes
().
getMsg
());
}
else
if
(
!
Common
.
isEmpty
(
check
)
&&
!
check
.
getResult
().
equals
(
CommonConstants
.
ZERO_ONE
))
{
}
else
if
(
null
!=
check
&&
!
check
.
getResult
().
equals
(
CommonConstants
.
ZERO_ONE
))
{
return
R
.
failed
(
check
.
getRemark
());
}
}
else
{
...
...
@@ -374,7 +371,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
//从剩下的项目档案中查找员工类型并更新
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
);
...
...
@@ -411,7 +410,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
//从剩下的项目档案中查找员工类型并更新
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
);
...
...
@@ -472,7 +473,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
//从剩下的项目档案中查找员工类型并更新
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
);
...
...
@@ -740,9 +743,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
@Transactional
public
void
importListAdd
(
List
<
EmployeeProjectVO
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
,
String
idAdd
)
{
// 通用校验获取失败的数据
List
<
TEmployeeInfo
>
updateList
=
new
ArrayList
();
List
<
TEmployeeProject
>
proInsList
=
new
ArrayList
();
List
<
TEmployeeProject
>
proupdateList
=
new
ArrayList
();
List
<
TEmployeeInfo
>
updateList
=
new
ArrayList
<>
();
List
<
TEmployeeProject
>
proInsList
=
new
ArrayList
<>
();
List
<
TEmployeeProject
>
proupdateList
=
new
ArrayList
<>
();
// 获取身份证、手机号列表,批量查询档案
Map
<
String
,
Integer
>
idCardMap
=
new
HashMap
<>();
...
...
@@ -756,11 +759,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
idCard
=
excel
.
getEmpIdcard
();
deptNo
=
excel
.
getDeptNo
();
if
(
excel
.
getEmpNatrue
().
equals
(
CommonConstants
.
ZERO_STRING
)
||
excel
.
getEmpNatrue
().
equals
(
CommonConstants
.
ONE_STRING
))
{
if
(
excel
.
getContractType
().
equals
(
CommonConstants
.
ONE_STRING
))
{
if
(
Common
.
isEmpty
(
excel
.
getWorkingHours
()))
{
if
(
excel
.
getContractType
().
equals
(
CommonConstants
.
ONE_STRING
)
&&
Common
.
isEmpty
(
excel
.
getWorkingHours
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"工时制不能为空!"
));
}
}
if
(
Common
.
isEmpty
(
excel
.
getEnjoinDate
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"入职日期不能为空!"
));
}
...
...
@@ -815,7 +816,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
EmployeeConstants
.
CHECK_NO_RESPONSE
));
}
else
if
(!
CommonConstants
.
SUCCESS
.
equals
(
vo
.
getRes
().
getCode
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
vo
.
getRes
().
getMsg
()));
}
else
if
(
!
Common
.
isEmpty
(
check
)
&&
!
check
.
getResult
().
equals
(
CommonConstants
.
ZERO_ONE
))
{
}
else
if
(
null
!=
check
&&
!
check
.
getResult
().
equals
(
CommonConstants
.
ZERO_ONE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
check
.
getRemark
()));
}
}
else
{
...
...
@@ -836,7 +837,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
//档案有(离职库),项目(已减档)
if
(
Common
.
isNotNull
(
tEmployeeInfo
)
&&
CommonConstants
.
dingleDigitIntArray
[
1
]
==
tEmployeeInfo
.
getFileStatus
()
&&
Common
.
isNotNull
(
tEmployeeProject
)
&&
CommonConstants
.
dingleDigitIntArray
[
1
]
==
tEmployeeProject
.
getProjectStatus
())
{
updateExcelPost
(
updateList
,
tEmployeeInfo
);
updateExcelPro
(
excel
,
proupdateList
,
tEmployeeProject
);
//档案有(离职库),项目无;
}
else
if
(
Common
.
isNotNull
(
tEmployeeInfo
)
&&
CommonConstants
.
dingleDigitIntArray
[
1
]
==
tEmployeeInfo
.
getFileStatus
()
...
...
@@ -855,21 +855,20 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
EmployeeConstants
.
CHECK_NO_RESPONSE
));
}
else
if
(!
CommonConstants
.
SUCCESS
.
equals
(
vo
.
getRes
().
getCode
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
vo
.
getRes
().
getMsg
()));
}
else
if
(
!
Common
.
isEmpty
(
check
)
&&
!
check
.
getResult
().
equals
(
CommonConstants
.
ZERO_ONE
))
{
}
else
if
(
null
!=
check
&&
!
check
.
getResult
().
equals
(
CommonConstants
.
ZERO_ONE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
check
.
getRemark
()));
}
}
else
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
EmployeeConstants
.
CHECK_NO_RESPONSE
));
}
}
updateExcelPost
(
updateList
,
tEmployeeInfo
);
insertExcelPro
(
excel
,
proInsList
,
tEmployeeInfo
);
//档案有(在档人员),项目(已减档)
}
else
if
(
Common
.
isNotNull
(
tEmployeeInfo
)
&&
CommonConstants
.
dingleDigitIntArray
[
0
]
==
tEmployeeInfo
.
getFileStatus
()
&&
Common
.
isNotNull
(
tEmployeeProject
)
&&
CommonConstants
.
dingleDigitIntArray
[
1
]
==
tEmployeeProject
.
getProjectStatus
())
{
updateExcelPost
(
updateList
,
tEmployeeInfo
);
updateExcelPro
(
excel
,
proupdateList
,
tEmployeeProject
);
}
updateExcelPost
(
updateList
,
tEmployeeInfo
);
//不允许复档复项
}
else
{
//档案有(离职库),项目(已减档)
...
...
@@ -973,12 +972,10 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
// 项目档案更新List
List
<
TEmployeeProject
>
updateList
=
new
ArrayList
<>();
// 人员档案更新List
List
<
TEmployeeInfo
>
updTEmployeeList
=
new
ArrayList
();
List
<
TEmployeeInfo
>
updTEmployeeList
=
new
ArrayList
<>
();
Map
<
String
,
Integer
>
checkCountMap
=
new
HashMap
<>();
// 新老档案List
List
<
EmployeeNewOldVO
>
updateInfoList
=
new
ArrayList
<>();
// 新老项目档案vo
EmployeeProjectNewOldVO
newOldProject
;
// 新老项目档案List
...
...
@@ -1019,7 +1016,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
EmployeeConstants
.
CHECK_NO_RESPONSE
));
}
else
if
(!
CommonConstants
.
SUCCESS
.
equals
(
vo
.
getRes
().
getCode
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
vo
.
getRes
().
getMsg
()));
}
else
if
(
!
Common
.
isEmpty
(
check
)
&&
!
check
.
getResult
().
equals
(
CommonConstants
.
ZERO_ONE
))
{
}
else
if
(
null
!=
check
&&
!
check
.
getResult
().
equals
(
CommonConstants
.
ZERO_ONE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
check
.
getRemark
()));
}
}
else
{
...
...
@@ -1181,10 +1178,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
String
fileName
=
"项目档案批量导出"
+
DateUtil
.
getThisTime
()
+
CommonConstants
.
XLSX
;
// 根据用户传入确定要导出的字段
Set
<
String
>
includeColumnFiledNames
=
new
HashSet
<>();
for
(
String
exportField
:
exportFields
)
{
includeColumnFiledNames
.
add
(
exportField
);
}
Set
<
String
>
includeColumnFiledNames
=
new
HashSet
<>(
exportFields
);
//获取要导出的列表
List
<
EmployeeProjectExportVO
>
list
;
...
...
@@ -1386,9 +1380,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
@Override
public
String
getEmpNo
(
String
deptNo
)
{
String
str
=
""
;
String
E
mpNo
=
baseMapper
.
findEmployeeMaxOnlyNoByDepId
(
deptNo
);
if
(!
Common
.
isEmpty
(
E
mpNo
))
{
str
=
NoUtil
.
productionNo
(
E
mpNo
,
CommonConstants
.
EMPLOYEE_INIT_NO_START
);
String
e
mpNo
=
baseMapper
.
findEmployeeMaxOnlyNoByDepId
(
deptNo
);
if
(!
Common
.
isEmpty
(
e
mpNo
))
{
str
=
NoUtil
.
productionNo
(
e
mpNo
,
CommonConstants
.
EMPLOYEE_INIT_NO_START
);
}
else
{
str
=
deptNo
+
CommonConstants
.
EMPLOYEE_INIT_NO
;
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoJointTask.java
View file @
1ba63982
...
...
@@ -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 @
1ba63982
...
...
@@ -1670,8 +1670,8 @@ 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
)
{
CommonConstants
.
ONE_INT
==
detail
.
getSettleType
()
&&
new
BigDecimal
(
success
.
getActualPremium
()).
compareTo
(
actualMoney
)
!=
0
)
{
//获取项目信息
TSettleDomain
settleDomain
=
new
TSettleDomain
();
List
<
TSettleDomainSelectVo
>
settleDomainR
=
null
;
...
...
@@ -1681,13 +1681,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
TSettleDomainListVo
tSettleDomainListVo
=
listVo
.
getData
();
if
(
Common
.
isNotNull
(
tSettleDomainListVo
)
&&
Common
.
isNotEmpty
(
tSettleDomainListVo
.
getListSelectVO
()))
{
settleDomainR
=
tSettleDomainListVo
.
getListSelectVO
();
for
(
TSettleDomainSelectVo
vo
:
settleDomainR
)
{
BeanUtils
.
copyProperties
(
vo
,
settleDomain
);
for
(
TSettleDomainSelectVo
vo
:
settleDomainR
)
{
BeanUtils
.
copyProperties
(
vo
,
settleDomain
);
}
}
}
BigDecimal
gMoney
=
BigDecimal
.
ZERO
;
B
oolean
isBl
=
false
;
b
oolean
isBl
=
false
;
if
(
Common
.
isNotNull
(
settleDomain
))
{
// 含有商险,则计算收入
if
(
settleDomain
.
getMrSettleType
().
equals
(
CommonConstants
.
TWO_STRING
))
{
...
...
@@ -1704,14 +1704,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
incomeDetail
.
setSourceId
(
detail
.
getId
());
if
(
isBl
)
{
incomeDetail
.
setMoney
(
gMoney
);
}
else
{
}
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
)
{
&&
!
detailInfoList
.
getData
().
getDetailList
().
isEmpty
()
)
{
//生成红冲数据
for
(
TIncomeDetail
detailInfo
:
detailInfoList
.
getData
().
getDetailList
())
{
TIncomeDetail
detail1
=
new
TIncomeDetail
();
...
...
@@ -1738,13 +1738,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
incomeDetail
.
setFeeType
(
CommonConstants
.
TWO_STRING
);
if
(
isBl
)
{
incomeDetail
.
setMoney
(
gMoney
);
}
else
{
}
else
{
incomeDetail
.
setMoney
(
actualMoney
);
}
//判断是否存在当月的商险收入数据
R
<
TIncomeDetailReturnVo
>
detailInfoList
=
socialDaprUtils
.
getTIncomeDetailList
(
incomeDetail
);
if
(
Common
.
isNotNull
(
detailInfoList
)
&&
detailInfoList
.
getCode
()
==
CommonConstants
.
SUCCESS
&&
detailInfoList
.
getData
().
getDetailList
().
size
()
>
0
)
{
&&
!
detailInfoList
.
getData
().
getDetailList
().
isEmpty
()
)
{
//生成红冲数据
for
(
TIncomeDetail
detailInfo
:
detailInfoList
.
getData
().
getDetailList
())
{
TIncomeDetail
detail1
=
new
TIncomeDetail
();
...
...
@@ -1762,7 +1762,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//生成收入数据
createInsuranceInfo
(
detail
);
}
}
}
catch
(
Exception
e
){
log
.
error
(
"收入数据同步处理失败:"
+
e
);
}
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TForecastLibrary.java
View file @
1ba63982
...
...
@@ -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 @
1ba63982
...
...
@@ -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