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
7f9b7c3b
Commit
7f9b7c3b
authored
Dec 23, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.2' into MVP1.2
parents
028d9827
59a0d47e
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
310 additions
and
97 deletions
+310
-97
EmployeeProjectExportParamVO.java
...lus/v1/yifu/archives/vo/EmployeeProjectExportParamVO.java
+8
-0
EmployeeProjectExportVO.java
...oud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
+3
-3
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+1
-1
TEmployeeContractInfoController.java
.../archives/controller/TEmployeeContractInfoController.java
+4
-1
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+1
-1
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+18
-6
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+9
-1
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+10
-10
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+9
-6
ErrorCodes.java
.../cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
+4
-0
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+2
-1
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+4
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+2
-2
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+5
-1
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+230
-64
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportParamVO.java
View file @
7f9b7c3b
...
...
@@ -450,6 +450,14 @@ public class EmployeeProjectExportParamVO extends BaseEntity {
@ExcelProperty
(
value
=
"项目档案状态"
)
private
String
status
;
/**
* 项目档案状态
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"项目档案状态"
)
@ExcelAttribute
(
name
=
"项目档案状态"
)
private
String
projectStatusReplace
;
/**
* 社保-省
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
View file @
7f9b7c3b
...
...
@@ -442,12 +442,12 @@ public class EmployeeProjectExportVO {
private
String
projectSource
;
/**
* 项目档案状态(0
草稿、1已审核
)
* 项目档案状态(0
=正常,1=已减项
)
*/
@ExcelAttribute
(
name
=
"项目档案状态"
,
readConverterExp
=
"0=草稿,1=已审核"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"项目档案状态"
)
private
String
status
;
@ExcelAttribute
(
name
=
"项目档案状态"
)
private
String
projectStatus
;
/**
* 项目档案创建人
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
7f9b7c3b
...
...
@@ -30,7 +30,7 @@ public class EmployeeConstants {
public
static
final
String
FILE_ROVINCE_MUST
=
"更新档案市,档案省必填"
;
public
static
final
String
FILE_CITY_MUST
=
"更新档案县,档案市必填"
;
public
static
final
String
DEPT_NO_ERROR
=
"项目编码错误"
;
public
static
final
String
DEPT_NO_EXIST
=
"未找到对应的项目
或者项目已停止合作
,请核实"
;
public
static
final
String
DEPT_NO_EXIST
=
"未找到对应的项目,请核实"
;
public
static
final
String
CHECK_ERROR
=
"校验服务错误,请联系管理员!"
;
public
static
final
String
CHECK_NO_RESPONSE
=
"校验服务器未返回,请联系管理员!"
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractInfoController.java
View file @
7f9b7c3b
...
...
@@ -373,10 +373,13 @@ public class TEmployeeContractInfoController {
@SysLog
(
"批量导出合同审核"
)
@PostMapping
(
"/exportAuditContractInfo"
)
@PreAuthorize
(
"@pms.hasPermission('employee_export_contract_audit')"
)
public
void
exportAuditContractInfo
(
@RequestBody
(
required
=
false
)
TEmployeeContractSearchVo
contractInfo
,
HttpServletResponse
response
)
{
public
void
exportAuditContractInfo
(
@RequestBody
(
required
=
false
)
TEmployeeContractSearchVo
contractInfo
,
@RequestParam
(
required
=
false
,
name
=
"mId"
)
String
mId
,
HttpServletResponse
response
)
{
if
(
Common
.
isEmpty
(
contractInfo
)){
contractInfo
=
new
TEmployeeContractSearchVo
();
}
contractInfo
.
setMId
(
mId
);
contractInfo
.
setAuditStatus
(
CommonConstants
.
ONE_INT
);
this
.
setAuth
(
contractInfo
);
tEmployeeContractInfoService
.
exportAuditContractInfo
(
contractInfo
,
response
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
7f9b7c3b
...
...
@@ -201,7 +201,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
));
if
(
Common
.
isNotNull
(
tEmployeeProject
))
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
CHECKS_CHANGE_EMP_PROJEC
T
,
excel
.
getNewSettleCode
()));
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
PROJECT_NEW_SEARCH_NOT_EXIS
T
,
excel
.
getNewSettleCode
()));
}
// 数据合法情况
if
(
CollUtil
.
isEmpty
(
errorMsg
))
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
7f9b7c3b
...
...
@@ -152,12 +152,16 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if
(
null
==
tEmployeeInfo
||
tEmployeeProject
==
null
)
{
return
R
.
failed
(
EMPINFO_IS_NOT_EXITS_BYID
);
}
TSettleDomain
settleDomain
=
tSettleDomainService
.
getOne
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
()
.
eq
(
TSettleDomain:
:
getDepartNo
,
tEmployeeContractInfo
.
getDeptNo
())
.
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TSettleDomain:
:
getStopFlag
,
CommonConstants
.
ZERO_STRING
));
if
(
Common
.
isEmpty
(
settleDomain
))
{
return
R
.
failed
(
EmployeeConstants
.
EMP_DISPATCH_SETTLEDOMAIN_STOP
);
if
(!(
ArchivesConstants
.
contractSituation
[
0
].
equals
(
tEmployeeContractInfo
.
getSituation
())
||
ArchivesConstants
.
contractSituation
[
6
].
equals
(
tEmployeeContractInfo
.
getSituation
())))
{
TSettleDomain
settleDomain
=
tSettleDomainService
.
getOne
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
()
.
eq
(
TSettleDomain:
:
getDepartNo
,
tEmployeeContractInfo
.
getDeptNo
())
.
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TSettleDomain:
:
getStopFlag
,
CommonConstants
.
ZERO_STRING
));
if
(
Common
.
isEmpty
(
settleDomain
))
{
return
R
.
failed
(
EmployeeConstants
.
EMP_DISPATCH_SETTLEDOMAIN_STOP
);
}
}
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
...
...
@@ -1023,6 +1027,14 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
insert
.
setContractEnd
(
contractInfo
.
getContractEnd
());
}
}
else
{
TSettleDomain
settleDomain
=
tSettleDomainService
.
getOne
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
()
.
eq
(
TSettleDomain:
:
getDepartNo
,
insert
.
getDeptNo
())
.
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TSettleDomain:
:
getStopFlag
,
CommonConstants
.
ZERO_STRING
));
if
(
Common
.
isEmpty
(
settleDomain
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
EmployeeConstants
.
EMP_DISPATCH_SETTLEDOMAIN_STOP
));
return
;
}
// 2022-9-28 16:59:57 徐梅说产品在验收时,业务说已完成一定任务的也不必填
if
(
EmployeeConstants
.
CONTRACT_TYPE_ONE
.
equals
(
insert
.
getContractType
())
&&
Common
.
isEmpty
(
insert
.
getContractEnd
()))
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
7f9b7c3b
...
...
@@ -957,6 +957,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
String
idCard
;
// 个性化校验逻辑
List
<
String
>
deptNoList
=
new
ArrayList
<>();
TSettleDomain
settleDomain
;
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
errorMsg
=
new
HashSet
<>();
// 判空
...
...
@@ -992,7 +993,6 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(!
deptNoList
.
isEmpty
())
{
List
<
TSettleDomain
>
deptList
=
tSettleDomainService
.
list
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
()
.
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TSettleDomain:
:
getStopFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
in
(
TSettleDomain:
:
getDepartNo
,
deptNoList
)
);
if
(
deptList
==
null
||
deptList
.
isEmpty
())
{
...
...
@@ -1112,6 +1112,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
saveList
.
add
(
saveEmp
);
}
}
else
{
settleDomain
=
tSettleDomainService
.
getOne
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
()
.
eq
(
TSettleDomain:
:
getDepartNo
,
excel
.
getDeptNo
())
.
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TSettleDomain:
:
getStopFlag
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isEmpty
(
settleDomain
))
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
PROJECT_SEARCH_NOT_EXIST
,
excel
.
getEmpIdcard
()));
}
// 档案不存在
// 校验身份证实名
TCheckIdCard
checkIdCard
=
new
TCheckIdCard
();
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
7f9b7c3b
...
...
@@ -128,14 +128,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return
new
R
<>(
CommonConstants
.
dingleDigitIntArray
[
2
],
"该人员已减档减项,是否“复档复项”"
,
map
);
}
}
//项目编码校验
TSettleDomain
tSettleDomain
=
tSettleDomainService
.
getOne
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
()
.
eq
(
TSettleDomain:
:
getDepartNo
,
tEmployeeProject
.
getDeptNo
())
.
eq
(
TSettleDomain:
:
getStopFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
));
if
(
Common
.
isEmpty
(
tSettleDomain
))
{
return
R
.
failed
(
"未找到对应的项目或者项目已停止合作,请核实"
);
}
//状态为草稿、已审核
if
(
CommonConstants
.
dingleDigitIntArray
[
0
]
==
employeeProject
.
getStatus
()
||
CommonConstants
.
dingleDigitIntArray
[
1
]
==
employeeProject
.
getStatus
())
{
...
...
@@ -154,6 +146,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return
new
R
<>(
CommonConstants
.
dingleDigitIntArray
[
3
],
"该人员在离职库已存在,是否“恢复档案”"
,
map
);
}
}
//项目编码校验
TSettleDomain
tSettleDomain
=
tSettleDomainService
.
getOne
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
()
.
eq
(
TSettleDomain:
:
getDepartNo
,
tEmployeeProject
.
getDeptNo
())
.
eq
(
TSettleDomain:
:
getStopFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
));
if
(
Common
.
isEmpty
(
tSettleDomain
))
{
return
R
.
failed
(
"未找到对应的项目或者项目已停止合作,请核实"
);
}
return
R
.
ok
();
}
...
...
@@ -407,7 +407,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(
contractCount
>
CommonConstants
.
ZERO_INT
){
errorTemp
.
append
(
"合同可用或在途、"
);
}
if
(
Common
.
isNotNull
(
errorTemp
)){
if
(
Common
.
isNotNull
(
errorTemp
.
toString
()
)){
return
R
.
failed
(
errorTemp
.
substring
(
0
,
errorTemp
.
length
()-
1
)
+
",禁止减项"
);
}
tEmployeeProject
.
setProjectStatus
(
CommonConstants
.
dingleDigitIntArray
[
1
]);
...
...
@@ -600,7 +600,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(
contractCount
>
CommonConstants
.
ZERO_INT
){
errorTemp
.
append
(
"合同可用或在途、"
);
}
if
(
Common
.
isNotNull
(
errorTemp
)){
if
(
Common
.
isNotNull
(
errorTemp
.
toString
()
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
errorMessage
+
errorTemp
.
substring
(
0
,
errorTemp
.
length
()-
1
)
+
",禁止减项"
));
break
;
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
7f9b7c3b
...
...
@@ -60,6 +60,7 @@
<resultMap
id=
"tEmployeeProjectExportMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO"
>
<result
property=
"empCode"
column=
"EMP_CODE"
/>
<result
property=
"projectStatus"
column=
"PROJECT_STATUS"
/>
<result
property=
"proEmpNatrue"
column=
"PROEMP_NATRUE"
/>
<result
property=
"empNatrue"
column=
"EMP_NATRUE"
/>
<result
property=
"empName"
column=
"EMP_NAME"
/>
...
...
@@ -103,7 +104,6 @@
<result
property=
"empNatrue"
column=
"EMP_NATRUE"
/>
<result
property=
"proCreateName"
column=
"PROCREATE_NAME"
/>
<result
property=
"proCreateTime"
column=
"PROCREATE_TIME"
/>
<result
property=
"status"
column=
"STATUS"
/>
<result
property=
"fileProvince"
column=
"FILE_PROVINCE"
/>
<result
property=
"fileCity"
column=
"FILE_CITY"
/>
<result
property=
"fileTown"
column=
"FILE_TOWN"
/>
...
...
@@ -224,7 +224,7 @@
b.ADMISSION_DATE,
b.GRADUTION_DATE,
b.REMARK,
if(a.STATUS=
0,'草稿','已审核')
STATUS,
if(a.STATUS=
'0','草稿',IF(a.PROJECT_STATUS=1,'已减项','已审核')) PROJECT_
STATUS,
a.CREATE_NAME,
a.CREATE_TIME,
b.EMP_EMAIL,
...
...
@@ -377,10 +377,10 @@
<if
test=
"tEmployeeProject.socialProvince != null"
>
AND a.SOCIAL_PROVINCE = #{tEmployeeProject.socialProvince}
</if>
<if
test=
"tEmployeeProject.
file
City != null"
>
<if
test=
"tEmployeeProject.
social
City != null"
>
AND a.SOCIAL_CITY = #{tEmployeeProject.socialCity}
</if>
<if
test=
"tEmployeeProject.
file
Town != null"
>
<if
test=
"tEmployeeProject.
social
Town != null"
>
AND a.SOCIAL_TOWN = #{tEmployeeProject.socialTown}
</if>
<if
test=
"tEmployeeProject.empNatureArray != null and tEmployeeProject.empNatureArray.length > 0"
>
...
...
@@ -435,6 +435,9 @@
<if
test=
"tEmployeeProject.empIdcard != null and tEmployeeProject.empIdcard.trim() != ''"
>
AND a.EMP_IDCARD like concat('%',#{tEmployeeProject.empIdcard},'%')
</if>
<if
test=
"tEmployeeProject.projectStatusReplace != null and tEmployeeProject.projectStatusReplace.trim() != ''"
>
AND a.PROJECT_STATUS = #{tEmployeeProject.projectStatusReplace}
</if>
<if
test=
"tEmployeeProject.bankName != null and tEmployeeProject.bankName.trim() != ''"
>
AND a.BANK_NAME = #{tEmployeeProject.bankName}
</if>
...
...
@@ -528,10 +531,10 @@
<if
test=
"tEmployeeProject.socialProvince != null"
>
AND a.SOCIAL_PROVINCE = #{tEmployeeProject.socialProvince}
</if>
<if
test=
"tEmployeeProject.
file
City != null"
>
<if
test=
"tEmployeeProject.
social
City != null"
>
AND a.SOCIAL_CITY = #{tEmployeeProject.socialCity}
</if>
<if
test=
"tEmployeeProject.
file
Town != null"
>
<if
test=
"tEmployeeProject.
social
Town != null"
>
AND a.SOCIAL_TOWN = #{tEmployeeProject.socialTown}
</if>
<if
test=
"tEmployeeProject.idList != null"
>
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
View file @
7f9b7c3b
...
...
@@ -307,6 +307,10 @@ public interface ErrorCodes {
* 人员在原项目中存在在途的服务,请先终止后,再进行划转
*/
String
QT_PROJECT_CHANGE_NOT_EXIST
=
"qt.project.change.not.exist"
;
/**
* 未找到对应的新项目或者新项目已停止合作,请核实
*/
String
PROJECT_NEW_SEARCH_NOT_EXIST
=
"project.new.search.not.exist"
;
/**
* 未找到对应的项目或者项目已停止合作,请核实
*/
...
...
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
7f9b7c3b
...
...
@@ -102,7 +102,8 @@ archives.project.change.contract.exist=\u4EBA\u5458\u5728\u8BE5\u9879\u76EE\u4E0
archives.project.emp.lose.fee.not.empty
=
\u
4E0D
\u
826F
\u
8BB0
\u
5F55
\u
8D39
\u7528\u
635F
\u5931\u
548C
\u5176\u
4ED6
\u
635F
\u5931\u
4E0D
\u
53EF
\u
540C
\u
65F6
\u
4E3A
\u
7A7A
qt.project.change.not.exist
=
\u
4EBA
\u5458\u5728\u
539F
\u9879\u
76EE
\u
4E2D
\u
5B58
\u5728\u5728\u9014\u7684\u
670D
\u
52A1
\u
FF0C
\u
8BF7
\u5148\u
7EC8
\u
6B62
\u
540E
\u
FF0C
\u
518D
\u
8FDB
\u
884C
\u5212\u
8F6C
project.search.not.exist
=
\u
672A
\u
627E
\u5230\u
5BF9
\u
5E94
\u7684\u
65B0
\u9879\u
76EE
\u6216\u8005\u
65B0
\u9879\u
76EE
\u
5DF2
\u
505C
\u
6B62
\u5408\u
4F5C
\u
FF0C
\u
8BF7
\u6838\u
5B9E
project.search.not.exist
=
\u
672A
\u
627E
\u5230\u
5BF9
\u
5E94
\u7684\u9879\u
76EE
\u6216\u8005\u9879\u
76EE
\u
5DF2
\u
505C
\u
6B62
\u5408\u
4F5C
\u
FF0C
\u
8BF7
\u6838\u
5B9E
project.new.search.not.exist
=
\u
672A
\u
627E
\u5230\u
5BF9
\u
5E94
\u7684\u
65B0
\u9879\u
76EE
\u6216\u8005\u
65B0
\u9879\u
76EE
\u
5DF2
\u
505C
\u
6B62
\u5408\u
4F5C
\u
FF0C
\u
8BF7
\u6838\u
5B9E
change.strat.month.exit
=
\u5212\u
8F6C
\u
8D77
\u
59CB
\u6708\u
4E0D
\u
80FD
\u
4E3A
\u
7A7A
change.less.month.exit
=
\u5212\u
8F6C
\u
8D77
\u
59CB
\u6708\u8981\u
5C0F
\u
4E8E
\u
7B49
\u
4E8E
\u
5F53
\u
524D
\u6708
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
7f9b7c3b
...
...
@@ -112,6 +112,10 @@ public class InsurancesConstants {
* 对应项目编码已停止合作
*/
public
static
final
String
EMP_DISPATCH_SETTLEDOMAIN_STOP
=
"对应项目编码已停止合作"
;
/**
* 对应替换员工项目编码已停止合作
*/
public
static
final
String
EMP_DISPATCH_REPALCE_SETTLEDOMAIN_STOP
=
"对应替换员工项目编码已停止合作"
;
/**
* 替换员工项目不存在
*/
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
7f9b7c3b
...
...
@@ -2890,10 +2890,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult
.
add
(
param
);
continue
;
}
else
{
//对应的项目编码已停止合作
//对应的
替换员工
项目编码已停止合作
if
(
CommonConstants
.
ONE_STRING
.
equals
(
projectSetInfoVo
.
getStopFlag
())
||
CommonConstants
.
TWO_STRING
.
equals
(
projectSetInfoVo
.
getStopFlag
())){
param
.
setErrorMessage
(
InsurancesConstants
.
EMP_DISPATCH_SETTLEDOMAIN_STOP
);
param
.
setErrorMessage
(
InsurancesConstants
.
EMP_DISPATCH_
REPALCE_
SETTLEDOMAIN_STOP
);
listResult
.
add
(
param
);
continue
;
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
7f9b7c3b
...
...
@@ -344,7 +344,11 @@ public class TDispatchInfoController {
@Operation
(
description
=
"导出派单审核记录 hasPermission('tdispatchinfo-export')"
)
@PostMapping
(
"/auditExport"
)
@PreAuthorize
(
"@pms.hasPermission('tdispatchinfo-export')"
)
public
void
auditExport
(
HttpServletResponse
response
,
@RequestBody
TDispatchInfoSearchVo
searchVo
)
{
public
void
auditExport
(
HttpServletResponse
response
,
@RequestBody
TDispatchInfoSearchVo
searchVo
,
@RequestParam
(
required
=
false
,
name
=
"mId"
)
String
mId
)
{
searchVo
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
searchVo
.
setStatus
(
CommonConstants
.
ONE_STRING
);
searchVo
.
setMId
(
mId
);
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
searchVo
);
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
()))
{
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
7f9b7c3b
...
...
@@ -923,9 +923,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
Common
.
isNotNull
(
list
))
{
TPaymentInfo
paymentInfo
;
TSocialFundInfo
socialInfo
;
TSocialInfo
tSocialInfo
;
TSocialInfo
tSocialInfo
=
new
TSocialInfo
()
;
String
temp
;
int
res
;
List
<
TSocialInfo
>
socialist
;
List
<
TSettleDomainSelectVo
>
settleDomainR
;
R
<
TSettleDomainListVo
>
listVo
;
List
<
TSocialFundInfo
>
socialInfoList
=
socialFundInfoMapper
.
selectList
(
Wrappers
.<
TSocialFundInfo
>
query
().
lambda
()
.
in
(
TSocialFundInfo:
:
getEmpIdcard
,
Common
.
listObjectToStrList
(
list
,
ExcelAttributeConstants
.
EMPIDCARD
)));
...
...
@@ -981,9 +984,29 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
if
(
null
==
socialInfo
)
{
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"无对应员工"
+
infoVo
.
getEmpIdcard
()
+
"的社保数据(请查验社保缴纳地)"
));
continue
;
boolean
isTrueAdder
=
false
;
socialist
=
socialInfoMapper
.
selectList
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
())
.
eq
(
TSocialInfo:
:
getSocialProvince
,
infoVo
.
getSocialProvince
())
.
eq
(
TSocialInfo:
:
getSocialCity
,
infoVo
.
getSocialCity
()));
if
(!
socialist
.
isEmpty
())
{
for
(
TSocialInfo
socialInfo1:
socialist
)
{
if
((
Common
.
isEmpty
(
infoVo
.
getSocialTown
())
||
(
Common
.
isNotNull
(
infoVo
.
getSocialTown
())
&&
infoVo
.
getSocialTown
().
equals
(
socialInfo1
.
getSocialTown
())))
&&
DateUtil
.
dateToString
(
socialInfo1
.
getSocialStartDate
(),
"yyyyMM"
).
compareTo
(
infoVo
.
getSocialPayMonth
())
<=
0
&&
(
Common
.
isEmpty
(
socialInfo1
.
getSocialReduceDate
())
||
(
Common
.
isNotNull
(
socialInfo1
.
getSocialReduceDate
())
&&
DateUtil
.
dateToString
(
socialInfo1
.
getSocialReduceDate
(),
"yyyyMM"
).
compareTo
(
infoVo
.
getSocialPayMonth
())
>=
0
)))
{
isTrueAdder
=
true
;
tSocialInfo
=
socialInfo1
;
break
;
}
}
}
if
(!
isTrueAdder
)
{
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"无对应员工"
+
infoVo
.
getEmpIdcard
()
+
"的社保数据(请查验社保缴纳地)"
));
continue
;
}
}
//导入模板判重 养老
...
...
@@ -1232,28 +1255,53 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
continue
;
}
}
tSocialInfo
=
socialInfoMapper
.
selectOne
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
()).
groupBy
(
TSocialInfo:
:
getCreateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isEmpty
(
tSocialInfo
))
{
tSocialInfo
=
socialInfoMapper
.
selectOne
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
()).
groupBy
(
TSocialInfo:
:
getCreateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
paymentInfo
=
new
TPaymentInfo
();
paymentInfo
.
setLockStatus
(
CommonConstants
.
ZERO_STRING
);
paymentInfo
.
setEmpId
(
socialInfo
.
getEmpId
());
paymentInfo
.
setEmpIdcard
(
socialInfo
.
getEmpIdcard
());
paymentInfo
.
setEmpName
(
socialInfo
.
getEmpName
());
paymentInfo
.
setSettleDomainId
(
socialInfo
.
getSettleDomain
());
paymentInfo
.
setSettleDomainName
(
socialInfo
.
getSettleDomainName
());
paymentInfo
.
setSettleDomainCode
(
socialInfo
.
getSettleDomainCode
());
paymentInfo
.
setUnitId
(
socialInfo
.
getUnitId
());
paymentInfo
.
setUnitName
(
socialInfo
.
getUnitName
());
if
(
Common
.
isNotNull
(
socialInfo
))
{
paymentInfo
.
setEmpId
(
socialInfo
.
getEmpId
());
paymentInfo
.
setEmpIdcard
(
socialInfo
.
getEmpIdcard
());
paymentInfo
.
setEmpName
(
socialInfo
.
getEmpName
());
paymentInfo
.
setSettleDomainId
(
socialInfo
.
getSettleDomain
());
paymentInfo
.
setSettleDomainName
(
socialInfo
.
getSettleDomainName
());
paymentInfo
.
setSettleDomainCode
(
socialInfo
.
getSettleDomainCode
());
paymentInfo
.
setUnitId
(
socialInfo
.
getUnitId
());
paymentInfo
.
setUnitName
(
socialInfo
.
getUnitName
());
paymentInfo
.
setSocialProvince
(
socialInfo
.
getSocialProvince
());
paymentInfo
.
setSocialCity
(
socialInfo
.
getSocialCity
());
paymentInfo
.
setSocialTown
(
socialInfo
.
getSocialTown
());
paymentInfo
.
setSocialHousehold
(
socialInfo
.
getSocialHouseholdName
());
}
else
if
(
Common
.
isNotNull
(
tSocialInfo
)){
paymentInfo
.
setEmpId
(
tSocialInfo
.
getEmpId
());
paymentInfo
.
setEmpIdcard
(
tSocialInfo
.
getEmpIdcard
());
paymentInfo
.
setEmpName
(
tSocialInfo
.
getEmpName
());
paymentInfo
.
setSettleDomainId
(
tSocialInfo
.
getSettleDomain
());
listVo
=
archivesDaprUtil
.
selectSettleDomainSelectVoById
(
tSocialInfo
.
getSettleDomain
());
if
(
Common
.
isNotNull
(
listVo
))
{
TSettleDomainListVo
tSettleDomainListVo
=
listVo
.
getData
();
if
(
Common
.
isNotNull
(
tSettleDomainListVo
)
&&
Common
.
isNotEmpty
(
tSettleDomainListVo
.
getListSelectVO
()))
{
settleDomainR
=
tSettleDomainListVo
.
getListSelectVO
();
for
(
TSettleDomainSelectVo
vo
:
settleDomainR
)
{
paymentInfo
.
setSettleDomainName
(
vo
.
getDepartName
());
paymentInfo
.
setSettleDomainCode
(
vo
.
getDepartNo
());
paymentInfo
.
setUnitId
(
vo
.
getCustomerId
());
paymentInfo
.
setUnitName
(
vo
.
getCustomerName
());
}
}
}
paymentInfo
.
setSocialProvince
(
tSocialInfo
.
getSocialProvince
());
paymentInfo
.
setSocialCity
(
tSocialInfo
.
getSocialCity
());
paymentInfo
.
setSocialTown
(
tSocialInfo
.
getSocialTown
());
paymentInfo
.
setSocialHousehold
(
tSocialInfo
.
getSocialHouseholdName
());
}
if
(
Common
.
isNotNull
(
tSocialInfo
))
{
paymentInfo
.
setInauguralTeam
(
tSocialInfo
.
getInauguralTeam
());
paymentInfo
.
setEmpNo
(
tSocialInfo
.
getEmpNo
());
}
paymentInfo
.
setSocialProvince
(
socialInfo
.
getSocialProvince
());
paymentInfo
.
setSocialCity
(
socialInfo
.
getSocialCity
());
paymentInfo
.
setSocialTown
(
socialInfo
.
getSocialTown
());
paymentInfo
.
setSocialHousehold
(
socialInfo
.
getSocialHouseholdName
());
paymentInfo
.
setSocialPayMonth
(
infoVo
.
getSocialPayMonth
());
if
(
null
!=
paymentInfo
.
getSocialProvince
())
{
...
...
@@ -1489,12 +1537,16 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
private
void
batchSavePaymentFundInfo
(
List
<
TPaymentInfoVo
>
list
,
List
<
ErrorDetailVO
>
errorMessageList
)
{
HashMap
<
String
,
String
>
areaMap
=
new
HashMap
<>();
HashMap
<
String
,
String
>
areaMap2
=
new
HashMap
<>();
R
<
AreaVo
>
areaListR
=
upmsDaprUtils
.
getAreaListR
();
if
(
Common
.
isNotNull
(
areaListR
))
{
AreaVo
areaList
=
areaListR
.
getData
();
if
(
null
!=
areaList
&&
!
areaList
.
getSysAreaList
().
isEmpty
())
{
for
(
SysArea
area
:
areaList
.
getSysAreaList
())
{
areaMap
.
put
(
Integer
.
toString
(
area
.
getId
()),
area
.
getAreaName
());
areaMap2
.
put
(
area
.
getAreaName
()
+
CommonConstants
.
DOWN_LINE_STRING
+
(
null
==
area
.
getParentId
()
?
"null"
:
(
0
==
area
.
getParentId
()
?
"null"
:
Integer
.
toString
(
area
.
getParentId
()))),
Integer
.
toString
(
area
.
getId
()));
}
}
}
...
...
@@ -1504,6 +1556,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
TSocialFundInfo
fund
;
String
temp
;
int
res
=
-
1
;
List
<
TProvidentFund
>
fundlist
;
TProvidentFund
tProvidentFund
=
new
TProvidentFund
();
List
<
TSettleDomainSelectVo
>
settleDomainR
;
R
<
TSettleDomainListVo
>
listVo
;
//获取身份证列表
List
<
String
>
idcards
=
list
.
stream
().
map
(
TPaymentInfoVo:
:
getEmpIdcard
).
collect
(
Collectors
.
toList
());
...
...
@@ -1574,13 +1630,33 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
continue
;
}
areaArray
=
infoVo
.
getProvidentPayAddr
().
split
(
CommonConstants
.
CENTER_SPLIT_LINE_STRING
);
fund
=
checkAddress
(
areaArray
,
areaMap
,
fund
);
fund
=
checkAddress
(
areaArray
,
areaMap
,
fund
,
areaMap2
,
infoVo
);
//无对应员工公积金数据
if
(
null
==
fund
)
{
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"无对应员工"
+
infoVo
.
getEmpName
()
+
CommonConstants
.
DOWN_LINE_STRING
+
infoVo
.
getEmpIdcard
()
+
"的公积金数据(请查验公积金缴纳地)!"
));
continue
;
boolean
isTrueAdder
=
false
;
fundlist
=
providentFundMapper
.
selectList
(
Wrappers
.<
TProvidentFund
>
query
().
lambda
()
.
eq
(
TProvidentFund:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
())
.
eq
(
TProvidentFund:
:
getFundProvince
,
infoVo
.
getSocialProvince
())
.
eq
(
TProvidentFund:
:
getFundCity
,
infoVo
.
getSocialCity
()));
if
(!
fundlist
.
isEmpty
())
{
for
(
TProvidentFund
providentFund:
fundlist
)
{
if
((
Common
.
isEmpty
(
infoVo
.
getSocialTown
())
||
(
Common
.
isNotNull
(
infoVo
.
getSocialTown
())
&&
infoVo
.
getFundTown
().
equals
(
providentFund
.
getFundTown
())))
&&
DateUtil
.
dateToString
(
providentFund
.
getProvidentStart
(),
"yyyyMM"
).
compareTo
(
infoVo
.
getProvidentPayMonth
())
<=
0
&&
(
Common
.
isEmpty
(
providentFund
.
getFundReduceDate
())
||
(
Common
.
isNotNull
(
providentFund
.
getFundReduceDate
())
&&
DateUtil
.
dateToString
(
providentFund
.
getFundReduceDate
(),
"yyyyMM"
).
compareTo
(
infoVo
.
getProvidentPayMonth
())
>=
0
)))
{
isTrueAdder
=
true
;
tProvidentFund
=
providentFund
;
break
;
}
}
}
if
(!
isTrueAdder
)
{
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"无对应员工"
+
infoVo
.
getEmpName
()
+
CommonConstants
.
DOWN_LINE_STRING
+
infoVo
.
getEmpIdcard
()
+
"的公积金数据(请查验公积金缴纳地)!"
));
continue
;
}
}
//计算公积金合计,个人金额和单位金额一致
infoVo
.
setProvidentSum
(
BigDecimalUtils
.
safeAdd
(
infoVo
.
getUnitProvidentSum
(),
infoVo
.
getUnitProvidentSum
()));
...
...
@@ -1606,29 +1682,54 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
continue
;
}
TProvidentFund
tProvidentFund
=
providentFundMapper
.
selectOne
(
Wrappers
.<
TProvidentFund
>
query
().
lambda
()
.
eq
(
TProvidentFund:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
()).
groupBy
(
TProvidentFund:
:
getCreateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isEmpty
(
tProvidentFund
))
{
tProvidentFund
=
providentFundMapper
.
selectOne
(
Wrappers
.<
TProvidentFund
>
query
().
lambda
()
.
eq
(
TProvidentFund:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
()).
groupBy
(
TProvidentFund:
:
getCreateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
paymentInfo
=
new
TPaymentInfo
();
paymentInfo
.
setLockStatus
(
CommonConstants
.
ZERO_STRING
);
paymentInfo
.
setEmpId
(
fund
.
getEmpId
());
paymentInfo
.
setEmpIdcard
(
fund
.
getEmpIdcard
());
paymentInfo
.
setEmpName
(
fund
.
getEmpName
());
paymentInfo
.
setSettleDomainId
(
fund
.
getSettleDomainFund
());
paymentInfo
.
setSettleDomainName
(
fund
.
getSettleDomainNameFund
());
paymentInfo
.
setSettleDomainCode
(
fund
.
getSettleDomainCodeFund
());
paymentInfo
.
setUnitId
(
fund
.
getUnitIdFund
());
paymentInfo
.
setUnitName
(
fund
.
getUnitNameFund
());
if
(
Common
.
isNotNull
(
fund
))
{
paymentInfo
.
setEmpId
(
fund
.
getEmpId
());
paymentInfo
.
setEmpIdcard
(
fund
.
getEmpIdcard
());
paymentInfo
.
setEmpName
(
fund
.
getEmpName
());
paymentInfo
.
setSettleDomainId
(
fund
.
getSettleDomainFund
());
paymentInfo
.
setSettleDomainName
(
fund
.
getSettleDomainNameFund
());
paymentInfo
.
setSettleDomainCode
(
fund
.
getSettleDomainCodeFund
());
paymentInfo
.
setUnitId
(
fund
.
getUnitIdFund
());
paymentInfo
.
setUnitName
(
fund
.
getUnitNameFund
());
paymentInfo
.
setFundProvince
(
fund
.
getFundProvince
());
paymentInfo
.
setFundCity
(
fund
.
getFundCity
());
paymentInfo
.
setFundTown
(
fund
.
getFundTown
());
paymentInfo
.
setProvidentHousehold
(
fund
.
getProvidentHouseholdName
());
}
else
if
(
Common
.
isNotNull
(
tProvidentFund
))
{
paymentInfo
.
setEmpId
(
tProvidentFund
.
getEmpId
());
paymentInfo
.
setEmpIdcard
(
tProvidentFund
.
getEmpIdcard
());
paymentInfo
.
setEmpName
(
tProvidentFund
.
getEmpName
());
paymentInfo
.
setSettleDomainId
(
tProvidentFund
.
getSettleDomain
());
listVo
=
archivesDaprUtil
.
selectSettleDomainSelectVoById
(
tProvidentFund
.
getSettleDomain
());
if
(
Common
.
isNotNull
(
listVo
))
{
TSettleDomainListVo
tSettleDomainListVo
=
listVo
.
getData
();
if
(
Common
.
isNotNull
(
tSettleDomainListVo
)
&&
Common
.
isNotEmpty
(
tSettleDomainListVo
.
getListSelectVO
()))
{
settleDomainR
=
tSettleDomainListVo
.
getListSelectVO
();
for
(
TSettleDomainSelectVo
vo
:
settleDomainR
)
{
paymentInfo
.
setSettleDomainName
(
vo
.
getDepartName
());
paymentInfo
.
setSettleDomainCode
(
vo
.
getDepartNo
());
paymentInfo
.
setUnitId
(
vo
.
getCustomerId
());
paymentInfo
.
setUnitName
(
vo
.
getCustomerName
());
}
}
}
paymentInfo
.
setFundProvince
(
tProvidentFund
.
getFundProvince
());
paymentInfo
.
setFundCity
(
tProvidentFund
.
getFundCity
());
paymentInfo
.
setFundTown
(
tProvidentFund
.
getFundTown
());
paymentInfo
.
setProvidentHousehold
(
tProvidentFund
.
getProvidentHouseholdName
());
}
if
(
Common
.
isNotNull
(
tProvidentFund
))
{
paymentInfo
.
setInauguralTeam
(
tProvidentFund
.
getInauguralTeam
());
paymentInfo
.
setEmpNo
(
tProvidentFund
.
getEmpNo
());
}
paymentInfo
.
setProvidentPayMonth
(
infoVo
.
getProvidentPayMonth
());
paymentInfo
.
setFundProvince
(
fund
.
getFundProvince
());
paymentInfo
.
setFundCity
(
fund
.
getFundCity
());
paymentInfo
.
setFundTown
(
fund
.
getFundTown
());
paymentInfo
.
setProvidentHousehold
(
fund
.
getProvidentHouseholdName
());
if
(
null
!=
paymentInfo
.
getFundProvince
())
{
temp
=
areaMap
.
get
(
paymentInfo
.
getFundProvince
());
if
(
Common
.
isNotNull
(
temp
))
{
...
...
@@ -1669,7 +1770,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ONE_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
()
,
CommonConstants
.
SAVE_SUCCESS
));
}
if
(
Common
.
isNotNull
(
paymentInfo
.
getId
())
&&
Common
.
isNotNull
(
paymentInfo
.
getFundId
()))
{
if
(
Common
.
isNotNull
(
paymentInfo
.
getId
())
&&
Common
.
isNotNull
(
paymentInfo
.
getFundId
()))
{
paymentInfoMap
.
put
(
paymentInfo
.
getProvidentPayAddr
()
+
CommonConstants
.
DOWN_LINE_STRING
+
paymentInfo
.
getEmpIdcard
().
trim
()
...
...
@@ -1996,10 +2097,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
Common
.
isNotNull
(
list
))
{
TPaymentInfo
payExists
;
TSocialFundInfo
socialInfo
=
null
;
TSocialInfo
tSocialInfo
;
TSocialInfo
tSocialInfo
=
new
TSocialInfo
()
;
String
temp
;
int
res
=
-
1
;
List
<
TSocialInfo
>
socialist
;
int
res
;
List
<
TSettleDomainSelectVo
>
settleDomainR
;
R
<
TSettleDomainListVo
>
listVo
;
List
<
TSocialFundInfo
>
socialInfoList
=
socialFundInfoMapper
.
selectList
(
Wrappers
.<
TSocialFundInfo
>
query
().
lambda
()
.
in
(
TSocialFundInfo:
:
getEmpIdcard
,
Common
.
listObjectToStrList
(
list
,
ExcelAttributeConstants
.
EMPIDCARD
)));
...
...
@@ -2047,9 +2150,29 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
}
if
(
null
==
socialInfo
)
{
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
""
,
""
,
infoVo
.
getEmpName
(),
"无对应员工"
+
infoVo
.
getEmpIdcard
()
+
"的社保数据(请查验社保缴纳地)"
));
continue
;
boolean
isTrueAdder
=
false
;
socialist
=
socialInfoMapper
.
selectList
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
())
.
eq
(
TSocialInfo:
:
getSocialProvince
,
infoVo
.
getSocialProvince
().
toString
())
.
eq
(
TSocialInfo:
:
getSocialCity
,
infoVo
.
getSocialCity
().
toString
()));
if
(!
socialist
.
isEmpty
())
{
for
(
TSocialInfo
socialInfo1:
socialist
)
{
if
((
Common
.
isEmpty
(
infoVo
.
getSocialTown
())
||
(
Common
.
isNotNull
(
infoVo
.
getSocialTown
())
&&
infoVo
.
getSocialTown
().
toString
().
equals
(
socialInfo1
.
getSocialTown
())))
&&
DateUtil
.
dateToString
(
socialInfo1
.
getSocialStartDate
(),
"yyyyMM"
).
compareTo
(
infoVo
.
getSocialPayMonth
())
<=
0
&&
(
Common
.
isEmpty
(
socialInfo1
.
getSocialReduceDate
())
||
(
Common
.
isNotNull
(
socialInfo1
.
getSocialReduceDate
())
&&
DateUtil
.
dateToString
(
socialInfo1
.
getSocialReduceDate
(),
"yyyyMM"
).
compareTo
(
infoVo
.
getSocialPayMonth
())
>=
0
)))
{
isTrueAdder
=
true
;
tSocialInfo
=
socialInfo1
;
break
;
}
}
}
if
(!
isTrueAdder
)
{
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
""
,
""
,
infoVo
.
getEmpName
(),
"无对应员工"
+
infoVo
.
getEmpIdcard
()
+
"的社保数据(请查验社保缴纳地)"
));
continue
;
}
}
//判断是否存在养老缴费数据
...
...
@@ -2245,30 +2368,53 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
}
tSocialInfo
=
socialInfoMapper
.
selectOne
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
()).
groupBy
(
TSocialInfo:
:
getCreateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isEmpty
(
tSocialInfo
))
{
tSocialInfo
=
socialInfoMapper
.
selectOne
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
()).
groupBy
(
TSocialInfo:
:
getCreateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
payExists
=
new
TPaymentInfo
();
payExists
.
setLockStatus
(
CommonConstants
.
ZERO_STRING
);
payExists
.
setEmpId
(
socialInfo
.
getEmpId
());
payExists
.
setEmpIdcard
(
socialInfo
.
getEmpIdcard
());
payExists
.
setEmpName
(
socialInfo
.
getEmpName
());
payExists
.
setSettleDomainId
(
socialInfo
.
getSettleDomain
());
payExists
.
setSettleDomainName
(
socialInfo
.
getSettleDomainName
());
payExists
.
setSettleDomainCode
(
socialInfo
.
getSettleDomainCode
());
payExists
.
setUnitId
(
socialInfo
.
getUnitId
());
payExists
.
setUnitName
(
socialInfo
.
getUnitName
());
if
(
Common
.
isNotNull
(
socialInfo
))
{
payExists
.
setEmpId
(
socialInfo
.
getEmpId
());
payExists
.
setEmpIdcard
(
socialInfo
.
getEmpIdcard
());
payExists
.
setEmpName
(
socialInfo
.
getEmpName
());
payExists
.
setSettleDomainId
(
socialInfo
.
getSettleDomain
());
payExists
.
setSettleDomainName
(
socialInfo
.
getSettleDomainName
());
payExists
.
setSettleDomainCode
(
socialInfo
.
getSettleDomainCode
());
payExists
.
setUnitId
(
socialInfo
.
getUnitId
());
payExists
.
setUnitName
(
socialInfo
.
getUnitName
());
payExists
.
setSocialProvince
(
socialInfo
.
getSocialProvince
());
payExists
.
setSocialCity
(
socialInfo
.
getSocialCity
());
payExists
.
setSocialTown
(
socialInfo
.
getSocialTown
());
payExists
.
setSocialHousehold
(
socialInfo
.
getSocialHouseholdName
());
}
else
if
(
Common
.
isNotNull
(
tSocialInfo
))
{
payExists
.
setEmpId
(
tSocialInfo
.
getEmpId
());
payExists
.
setEmpIdcard
(
tSocialInfo
.
getEmpIdcard
());
payExists
.
setEmpName
(
tSocialInfo
.
getEmpName
());
payExists
.
setSettleDomainId
(
tSocialInfo
.
getSettleDomain
());
listVo
=
archivesDaprUtil
.
selectSettleDomainSelectVoById
(
tSocialInfo
.
getSettleDomain
());
if
(
Common
.
isNotNull
(
listVo
))
{
TSettleDomainListVo
tSettleDomainListVo
=
listVo
.
getData
();
if
(
Common
.
isNotNull
(
tSettleDomainListVo
)
&&
Common
.
isNotEmpty
(
tSettleDomainListVo
.
getListSelectVO
()))
{
settleDomainR
=
tSettleDomainListVo
.
getListSelectVO
();
for
(
TSettleDomainSelectVo
vo
:
settleDomainR
)
{
payExists
.
setSettleDomainName
(
vo
.
getDepartName
());
payExists
.
setSettleDomainCode
(
vo
.
getDepartNo
());
payExists
.
setUnitId
(
vo
.
getCustomerId
());
payExists
.
setUnitName
(
vo
.
getCustomerName
());
}
}
}
payExists
.
setSocialProvince
(
tSocialInfo
.
getSocialProvince
());
payExists
.
setSocialCity
(
tSocialInfo
.
getSocialCity
());
payExists
.
setSocialTown
(
tSocialInfo
.
getSocialTown
());
payExists
.
setSocialHousehold
(
tSocialInfo
.
getSocialHouseholdName
());
}
if
(
Common
.
isNotNull
(
tSocialInfo
))
{
payExists
.
setInauguralTeam
(
tSocialInfo
.
getInauguralTeam
());
payExists
.
setEmpNo
(
tSocialInfo
.
getEmpNo
());
}
payExists
.
setSocialProvince
(
socialInfo
.
getSocialProvince
());
payExists
.
setSocialCity
(
socialInfo
.
getSocialCity
());
payExists
.
setSocialTown
(
socialInfo
.
getSocialTown
());
payExists
.
setSocialHousehold
(
socialInfo
.
getSocialHouseholdName
());
payExists
.
setSocialPayMonth
(
infoVo
.
getSocialPayMonth
());
if
(
null
!=
payExists
.
getSocialProvince
())
{
...
...
@@ -2403,11 +2549,29 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
//比对缴纳地是否一致
private
TSocialFundInfo
checkAddress
(
String
[]
areaArray
,
HashMap
<
String
,
String
>
areaMap
,
TSocialFundInfo
s
)
{
private
TSocialFundInfo
checkAddress
(
String
[]
areaArray
,
HashMap
<
String
,
String
>
areaMap
,
TSocialFundInfo
s
,
HashMap
<
String
,
String
>
areaMap2
,
TPaymentInfoVo
infoVo
)
{
if
(
null
==
areaArray
||
null
==
areaMap
||
null
==
s
)
{
return
null
;
}
String
temp
;
if
(
areaArray
.
length
>=
CommonConstants
.
TWO_INT
)
{
temp
=
areaMap2
.
get
(
areaArray
[
0
]
+
CommonConstants
.
DOWN_LINE_STRING
+
"null"
);
if
(
Common
.
isNotNull
(
temp
))
{
infoVo
.
setSocialProvince
(
temp
);
}
temp
=
areaMap2
.
get
(
areaArray
[
1
]
+
CommonConstants
.
DOWN_LINE_STRING
+
(
null
==
infoVo
.
getSocialProvince
()
?
"null"
:
infoVo
.
getSocialProvince
()));
if
(
Common
.
isNotNull
(
temp
))
{
infoVo
.
setSocialCity
(
temp
);
}
if
(
areaArray
.
length
>=
CommonConstants
.
THREE_INT
)
{
temp
=
areaMap2
.
get
(
areaArray
[
2
]
+
CommonConstants
.
DOWN_LINE_STRING
+
(
null
==
infoVo
.
getSocialCity
()
?
"null"
:
infoVo
.
getSocialCity
()));
if
(
Common
.
isNotNull
(
temp
))
{
infoVo
.
setSocialTown
(
temp
);
}
}
if
(
null
!=
s
.
getFundProvince
())
{
if
(
areaArray
[
0
].
equals
(
areaMap
.
get
(
s
.
getFundProvince
())))
{
if
(
null
!=
s
.
getFundCity
())
{
...
...
@@ -2616,6 +2780,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
sumList
=
baseMapper
.
selectList
(
Wrappers
.<
TPaymentInfo
>
query
().
lambda
()
.
eq
(
TPaymentInfo:
:
getIncomeStatus
,
CommonConstants
.
ONE_STRING
)
.
eq
(
TPaymentInfo:
:
getLockStatus
,
CommonConstants
.
ONE_STRING
)
.
eq
(
TPaymentInfo:
:
getIsIncomeStatus
,
CommonConstants
.
ZERO_STRING
)
.
isNotNull
(
TPaymentInfo:
:
getSocialId
).
last
(
" limit 0,10000"
));
synchronized
(
this
)
{
if
(
Common
.
isNotNull
(
sumList
))
{
...
...
@@ -2654,6 +2819,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
sumList
=
baseMapper
.
selectList
(
Wrappers
.<
TPaymentInfo
>
query
().
lambda
()
.
eq
(
TPaymentInfo:
:
getIncomeStatus
,
CommonConstants
.
ONE_STRING
)
.
eq
(
TPaymentInfo:
:
getLockStatus
,
CommonConstants
.
ONE_STRING
)
.
eq
(
TPaymentInfo:
:
getIsIncomeStatus
,
CommonConstants
.
ZERO_STRING
)
.
isNotNull
(
TPaymentInfo:
:
getFundId
).
last
(
" limit 0,10000"
));
synchronized
(
this
)
{
if
(
Common
.
isNotNull
(
sumList
))
{
...
...
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