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
d263a2e1
Commit
d263a2e1
authored
Nov 29, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
薪资审核优化
parent
43b546c9
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
11 deletions
+15
-11
TEmployeeProjectController.java
.../yifu/archives/controller/TEmployeeProjectController.java
+2
-2
TEmployeeProjectService.java
...lus/v1/yifu/archives/service/TEmployeeProjectService.java
+1
-1
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+1
-2
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+2
-2
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+9
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java
View file @
d263a2e1
...
...
@@ -317,11 +317,11 @@ public class TEmployeeProjectController {
}
/**
* @Description: 更新
人员档案、
项目档案的商险状态
* @Description: 更新项目档案的商险状态
* @Author: hgw
* @Date: 2022-11-23 17:17:59
**/
@Operation
(
summary
=
"更新
人员档案、项目档案的商险状态"
,
description
=
"更新人员档案、
项目档案的商险状态"
)
@Operation
(
summary
=
"更新
项目档案的商险状态"
,
description
=
"更新
项目档案的商险状态"
)
@Inner
@PostMapping
(
"/inner/updateEmployeeInsuranceStatus"
)
public
Boolean
updateEmployeeInsuranceStatus
(
@RequestBody
EmpStatusVo
vo
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @
d263a2e1
...
...
@@ -193,7 +193,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
/**
* @param vo
* @Description: 更新
人员档案、
项目档案的商险状态
* @Description: 更新项目档案的商险状态
* @Author: hgw
* @Date: 2022/11/23 17:20
* @return: java.lang.Boolean
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
d263a2e1
...
...
@@ -1354,7 +1354,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
/**
* @Description: 更新
人员、
项目档案的商险状态
* @Description: 更新项目档案的商险状态
* @Author: hgw
* @Date: 2022/11/23 17:45
* @return: java.lang.Boolean
...
...
@@ -1366,7 +1366,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
for
(
EmpIdCardAndDeptVo
emp
:
vo
.
getEmpInfo
())
{
baseMapper
.
updateEmployeeInsuranceStatus
(
emp
);
tEmployeeInfoMapper
.
updateEmployeeInfoInsuranceStatus
(
emp
);
}
return
true
;
}
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
d263a2e1
...
...
@@ -311,7 +311,7 @@ public class ArchivesDaprUtil {
}
/**
* @Description: 更新
人员档案与项目档案,状态一致
。商险的status 0无2正常3失效4处理中
* @Description: 更新
项目档案的商险状态
。商险的status 0无2正常3失效4处理中
* @Author: hgw
* @Date: 2022/11/23 15:29
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
...
...
@@ -322,7 +322,7 @@ public class ArchivesDaprUtil {
,
"/temployeeproject/inner/updateEmployeeInsuranceStatus"
,
JSON
.
toJSONString
(
empStatusVo
)
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isEmpty
(
res
)){
return
R
.
failed
(
"更新【
人员档案、
项目档案】的商险状态失败!"
);
return
R
.
failed
(
"更新【项目档案】的商险状态失败!"
);
}
return
res
;
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
d263a2e1
...
...
@@ -334,7 +334,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List
<
TInsuranceDetail
>
detailList
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isNotEmpty
(
listSuccess
)){
List
<
String
>
sourceIdCardList
=
new
ArrayList
<>();
List
<
String
>
replaceIdList
=
new
ArrayList
<>();
for
(
InsuranceAddParam
success
:
listSuccess
)
{
TInsuranceDetail
detail
=
new
TInsuranceDetail
();
BeanCopyUtils
.
copyProperties
(
success
,
detail
);
...
...
@@ -354,9 +353,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail
.
setCreateName
(
user
.
getNickname
());
detailList
.
add
(
detail
);
sourceIdCardList
.
add
(
detail
.
getEmpIdcardNo
());
replaceIdList
.
add
(
detail
.
getId
());
}
this
.
saveBatch
(
detailList
);
List
<
String
>
replaceIdList
=
new
ArrayList
<>();
for
(
TInsuranceDetail
d
:
detailList
)
{
replaceIdList
.
add
(
d
.
getId
());
}
// 同步操作档案的 商险状态为:2正常(0无2正常3失效4处理中)
this
.
doFailInfo
(
detailList
,
sourceIdCardList
,
replaceIdList
,
CommonConstants
.
FOUR_STRING
);
}
...
...
@@ -1630,9 +1632,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
**/
private
EmpStatusVo
getEmpStatusVo
(
Map
<
String
,
Integer
>
empStatusMap
,
boolean
isDept
)
{
EmpStatusVo
empStatusVo
=
new
EmpStatusVo
();
EmpIdCardAndDeptVo
empIdCardAndDeptVo
=
new
EmpIdCardAndDeptVo
()
;
EmpIdCardAndDeptVo
empIdCardAndDeptVo
;
List
<
EmpIdCardAndDeptVo
>
voList
=
new
ArrayList
<>();
for
(
Map
.
Entry
<
String
,
Integer
>
entry
:
empStatusMap
.
entrySet
())
{
empIdCardAndDeptVo
=
new
EmpIdCardAndDeptVo
();
if
(
isDept
)
{
empIdCardAndDeptVo
.
setIdCard
(
entry
.
getKey
().
split
(
CommonConstants
.
DOWN_LINE_STRING
)[
0
]);
empIdCardAndDeptVo
.
setDeptNo
(
entry
.
getKey
().
split
(
CommonConstants
.
DOWN_LINE_STRING
)[
1
]);
...
...
@@ -1680,9 +1683,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
**/
private
void
updateEmpInfp
(
List
<
TInsuranceDetail
>
sourceList
,
String
status
)
{
EmpStatusVo
empStatusVo
=
new
EmpStatusVo
();
EmpIdCardAndDeptVo
empIdCardAndDeptVo
=
new
EmpIdCardAndDeptVo
()
;
EmpIdCardAndDeptVo
empIdCardAndDeptVo
;
List
<
EmpIdCardAndDeptVo
>
voList
=
new
ArrayList
<>();
for
(
TInsuranceDetail
d
:
sourceList
)
{
empIdCardAndDeptVo
=
new
EmpIdCardAndDeptVo
();
empIdCardAndDeptVo
.
setIdCard
(
d
.
getEmpIdcardNo
());
empIdCardAndDeptVo
.
setDeptNo
(
d
.
getDeptNo
());
empIdCardAndDeptVo
.
setStatus
(
status
);
...
...
@@ -1690,6 +1694,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
empStatusVo
.
setEmpInfo
(
voList
);
archivesDaprUtil
.
updateEmployeeInsuranceStatus
(
empStatusVo
);
archivesDaprUtil
.
updateEmployeeInfoInsuranceStatus
(
empStatusVo
);
}
/**
...
...
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