Commit d263a2e1 authored by hongguangwu's avatar hongguangwu

薪资审核优化

parent 43b546c9
...@@ -317,11 +317,11 @@ public class TEmployeeProjectController { ...@@ -317,11 +317,11 @@ public class TEmployeeProjectController {
} }
/** /**
* @Description: 更新人员档案、项目档案的商险状态 * @Description: 更新项目档案的商险状态
* @Author: hgw * @Author: hgw
* @Date: 2022-11-23 17:17:59 * @Date: 2022-11-23 17:17:59
**/ **/
@Operation(summary = "更新人员档案、项目档案的商险状态", description = "更新人员档案、项目档案的商险状态") @Operation(summary = "更新项目档案的商险状态", description = "更新项目档案的商险状态")
@Inner @Inner
@PostMapping("/inner/updateEmployeeInsuranceStatus") @PostMapping("/inner/updateEmployeeInsuranceStatus")
public Boolean updateEmployeeInsuranceStatus(@RequestBody EmpStatusVo vo) { public Boolean updateEmployeeInsuranceStatus(@RequestBody EmpStatusVo vo) {
......
...@@ -193,7 +193,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> { ...@@ -193,7 +193,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
/** /**
* @param vo * @param vo
* @Description: 更新人员档案、项目档案的商险状态 * @Description: 更新项目档案的商险状态
* @Author: hgw * @Author: hgw
* @Date: 2022/11/23 17:20 * @Date: 2022/11/23 17:20
* @return: java.lang.Boolean * @return: java.lang.Boolean
......
...@@ -1354,7 +1354,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1354,7 +1354,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
} }
/** /**
* @Description: 更新人员、项目档案的商险状态 * @Description: 更新项目档案的商险状态
* @Author: hgw * @Author: hgw
* @Date: 2022/11/23 17:45 * @Date: 2022/11/23 17:45
* @return: java.lang.Boolean * @return: java.lang.Boolean
...@@ -1366,7 +1366,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1366,7 +1366,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
} }
for (EmpIdCardAndDeptVo emp : vo.getEmpInfo()) { for (EmpIdCardAndDeptVo emp : vo.getEmpInfo()) {
baseMapper.updateEmployeeInsuranceStatus(emp); baseMapper.updateEmployeeInsuranceStatus(emp);
tEmployeeInfoMapper.updateEmployeeInfoInsuranceStatus(emp);
} }
return true; return true;
} }
......
...@@ -311,7 +311,7 @@ public class ArchivesDaprUtil { ...@@ -311,7 +311,7 @@ public class ArchivesDaprUtil {
} }
/** /**
* @Description: 更新人员档案与项目档案,状态一致。商险的status 0无2正常3失效4处理中 * @Description: 更新项目档案的商险状态。商险的status 0无2正常3失效4处理中
* @Author: hgw * @Author: hgw
* @Date: 2022/11/23 15:29 * @Date: 2022/11/23 15:29
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
...@@ -322,7 +322,7 @@ public class ArchivesDaprUtil { ...@@ -322,7 +322,7 @@ public class ArchivesDaprUtil {
,"/temployeeproject/inner/updateEmployeeInsuranceStatus" ,"/temployeeproject/inner/updateEmployeeInsuranceStatus"
, JSON.toJSONString(empStatusVo) , Boolean.class, SecurityConstants.FROM_IN); , JSON.toJSONString(empStatusVo) , Boolean.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){ if (Common.isEmpty(res)){
return R.failed("更新【人员档案、项目档案】的商险状态失败!"); return R.failed("更新【项目档案】的商险状态失败!");
} }
return res; return res;
} }
......
...@@ -334,7 +334,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -334,7 +334,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List<TInsuranceDetail> detailList = new ArrayList<>(); List<TInsuranceDetail> detailList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(listSuccess)){ if (CollectionUtils.isNotEmpty(listSuccess)){
List<String> sourceIdCardList = new ArrayList<>(); List<String> sourceIdCardList = new ArrayList<>();
List<String> replaceIdList = new ArrayList<>();
for (InsuranceAddParam success : listSuccess) { for (InsuranceAddParam success : listSuccess) {
TInsuranceDetail detail = new TInsuranceDetail(); TInsuranceDetail detail = new TInsuranceDetail();
BeanCopyUtils.copyProperties(success,detail); BeanCopyUtils.copyProperties(success,detail);
...@@ -354,9 +353,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -354,9 +353,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail.setCreateName(user.getNickname()); detail.setCreateName(user.getNickname());
detailList.add(detail); detailList.add(detail);
sourceIdCardList.add(detail.getEmpIdcardNo()); sourceIdCardList.add(detail.getEmpIdcardNo());
replaceIdList.add(detail.getId());
} }
this.saveBatch(detailList); this.saveBatch(detailList);
List<String> replaceIdList = new ArrayList<>();
for (TInsuranceDetail d : detailList) {
replaceIdList.add(d.getId());
}
// 同步操作档案的 商险状态为:2正常(0无2正常3失效4处理中) // 同步操作档案的 商险状态为:2正常(0无2正常3失效4处理中)
this.doFailInfo(detailList, sourceIdCardList, replaceIdList, CommonConstants.FOUR_STRING); this.doFailInfo(detailList, sourceIdCardList, replaceIdList, CommonConstants.FOUR_STRING);
} }
...@@ -1630,9 +1632,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1630,9 +1632,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
**/ **/
private EmpStatusVo getEmpStatusVo(Map<String, Integer> empStatusMap, boolean isDept) { private EmpStatusVo getEmpStatusVo(Map<String, Integer> empStatusMap, boolean isDept) {
EmpStatusVo empStatusVo = new EmpStatusVo(); EmpStatusVo empStatusVo = new EmpStatusVo();
EmpIdCardAndDeptVo empIdCardAndDeptVo = new EmpIdCardAndDeptVo(); EmpIdCardAndDeptVo empIdCardAndDeptVo;
List<EmpIdCardAndDeptVo> voList = new ArrayList<>(); List<EmpIdCardAndDeptVo> voList = new ArrayList<>();
for (Map.Entry<String, Integer> entry : empStatusMap.entrySet()) { for (Map.Entry<String, Integer> entry : empStatusMap.entrySet()) {
empIdCardAndDeptVo = new EmpIdCardAndDeptVo();
if (isDept) { if (isDept) {
empIdCardAndDeptVo.setIdCard(entry.getKey().split(CommonConstants.DOWN_LINE_STRING)[0]); empIdCardAndDeptVo.setIdCard(entry.getKey().split(CommonConstants.DOWN_LINE_STRING)[0]);
empIdCardAndDeptVo.setDeptNo(entry.getKey().split(CommonConstants.DOWN_LINE_STRING)[1]); empIdCardAndDeptVo.setDeptNo(entry.getKey().split(CommonConstants.DOWN_LINE_STRING)[1]);
...@@ -1680,9 +1683,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1680,9 +1683,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
**/ **/
private void updateEmpInfp(List<TInsuranceDetail> sourceList, String status) { private void updateEmpInfp(List<TInsuranceDetail> sourceList, String status) {
EmpStatusVo empStatusVo = new EmpStatusVo(); EmpStatusVo empStatusVo = new EmpStatusVo();
EmpIdCardAndDeptVo empIdCardAndDeptVo = new EmpIdCardAndDeptVo(); EmpIdCardAndDeptVo empIdCardAndDeptVo;
List<EmpIdCardAndDeptVo> voList = new ArrayList<>(); List<EmpIdCardAndDeptVo> voList = new ArrayList<>();
for (TInsuranceDetail d : sourceList) { for (TInsuranceDetail d : sourceList) {
empIdCardAndDeptVo = new EmpIdCardAndDeptVo();
empIdCardAndDeptVo.setIdCard(d.getEmpIdcardNo()); empIdCardAndDeptVo.setIdCard(d.getEmpIdcardNo());
empIdCardAndDeptVo.setDeptNo(d.getDeptNo()); empIdCardAndDeptVo.setDeptNo(d.getDeptNo());
empIdCardAndDeptVo.setStatus(status); empIdCardAndDeptVo.setStatus(status);
...@@ -1690,6 +1694,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1690,6 +1694,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
empStatusVo.setEmpInfo(voList); empStatusVo.setEmpInfo(voList);
archivesDaprUtil.updateEmployeeInsuranceStatus(empStatusVo); archivesDaprUtil.updateEmployeeInsuranceStatus(empStatusVo);
archivesDaprUtil.updateEmployeeInfoInsuranceStatus(empStatusVo);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment