Commit 714e8ea4 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.19' into MVP1.7.19

parents 4ebd0e9a a97cf970
...@@ -446,13 +446,13 @@ ...@@ -446,13 +446,13 @@
</where> </where>
order by a.APPLY_NO desc order by a.APPLY_NO desc
</select> </select>
<!--审核列表--> <!--审核列表 电子签不要审核,但是作废、终止的要审核-->
<select id="getTEmployeeContractInfoPageByAudit" resultMap="tEmployeeContrctInfoMap"> <select id="getTEmployeeContractInfoPageByAudit" resultMap="tEmployeeContrctInfoMap">
SELECT SELECT
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_employee_contract_info a FROM t_employee_contract_info a
<where> <where>
a.DELETE_FLAG = 0 and (a.sign_type is null or a.sign_type = '1') a.DELETE_FLAG = 0 and (a.sign_type is null or a.sign_type = '1' or a.SITUATION in ('作废','终止') )
<include refid="tEmployeeContractInfo_where"/> <include refid="tEmployeeContractInfo_where"/>
<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''"> <if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
${tEmployeeContractInfo.authSql} ${tEmployeeContractInfo.authSql}
......
...@@ -1242,6 +1242,10 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1242,6 +1242,10 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
List<ErrorMessage> contractParamList ; List<ErrorMessage> contractParamList ;
List<ErrorMessage> projectParamList ; List<ErrorMessage> projectParamList ;
List<ErrorMessage> empParamList ; List<ErrorMessage> empParamList ;
String closeRemark = "已在其他入口处理";
BaseSearchVO returnVo;
BaseSearchVO paramVo;
R<BaseSearchVO> returnR;
// 社保-完成 // 社保-完成
if (!socialOldList.isEmpty()) { if (!socialOldList.isEmpty()) {
TDispatchReduceListVo paramListVo = new TDispatchReduceListVo(); TDispatchReduceListVo paramListVo = new TDispatchReduceListVo();
...@@ -1281,6 +1285,21 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1281,6 +1285,21 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave.setDoStatusSocial(CommonConstants.THREE_STRING); leave.setDoStatusSocial(CommonConstants.THREE_STRING);
} }
} }
// 1社保:加一重保险:失败的再查一下是否已完结,变为无需处理
if (CommonConstants.THREE_STRING.equals(leave.getDoStatusSocial())) {
paramVo = new BaseSearchVO();
paramVo.setEmpIdCard(leave.getEmpIdcard());
paramVo.setDeptNo(leave.getDeptNo());
returnR = socialDaprUtils.getSocialAndFundStatusByClose(paramVo);
if (null != returnR && Common.isNotNull(returnR.getData())) {
returnVo = returnR.getData();
if (Common.isNotNull(returnVo.getResultIdOne())) {
leave.setSocialId(returnVo.getResultIdOne());
leave.setDoStatusSocial(CommonConstants.ONE_STRING);
leave.setCloseRemarkSocial(closeRemark);
}
}
}
} }
} }
} }
...@@ -1323,6 +1342,21 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1323,6 +1342,21 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave.setDoStatusFund(CommonConstants.THREE_STRING); leave.setDoStatusFund(CommonConstants.THREE_STRING);
} }
} }
// 2公积金:加一重保险:失败的再查一下是否已完结,变为无需处理
if (CommonConstants.THREE_STRING.equals(leave.getDoStatusFund())) {
paramVo = new BaseSearchVO();
paramVo.setEmpIdCard(leave.getEmpIdcard());
paramVo.setDeptNo(leave.getDeptNo());
returnR = socialDaprUtils.getSocialAndFundStatusByClose(paramVo);
if (null != returnR && Common.isNotNull(returnR.getData())) {
returnVo = returnR.getData();
if (Common.isNotNull(returnVo.getResultIdTwo())) {
leave.setFundId(returnVo.getResultIdTwo());
leave.setDoStatusFund(CommonConstants.ONE_STRING);
leave.setCloseRemarkFund(closeRemark);
}
}
}
} }
} }
} }
...@@ -1351,6 +1385,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1351,6 +1385,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
// 错误的商险派单 // 错误的商险派单
List<String> errorList = new ArrayList<>(); List<String> errorList = new ArrayList<>();
List<String> successList = new ArrayList<>(); List<String> successList = new ArrayList<>();
String insuranceIdTemp;
for (EmployeeRegistrationLeave leave : leaveList) { for (EmployeeRegistrationLeave leave : leaveList) {
if (judgeToUpdateInsurance(isExit, doType, nowTime, leave) ) { if (judgeToUpdateInsurance(isExit, doType, nowTime, leave) ) {
errorMsg = new StringBuilder(); errorMsg = new StringBuilder();
...@@ -1381,9 +1416,31 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1381,9 +1416,31 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
} }
} }
} }
// 3商险:加一重保险:失败的再查一下是否已完结,变为无需处理
if (CommonConstants.THREE_STRING.equals(leave.getDoStatusInsurance())) {
paramVo = new BaseSearchVO();
paramVo.setEmpIdCard(leave.getEmpIdcard());
paramVo.setDeptNo(leave.getDeptNo());
insuranceIdTemp = "";
returnR = insuranceDaprUtil.getInsurancesStatusByClose(paramVo);
if (null != returnR && Common.isNotNull(returnR.getData())) {
returnVo = returnR.getData();
if (Common.isNotNull(returnVo.getResultIdOne())) {
insuranceIdTemp = returnVo.getResultIdOne();
}
}
// 这个反着查的,有未减完的,表示不可以关闭它,只能忽略它
if (Common.isEmpty(insuranceIdTemp)) {
leave.setInsuranceId(leave.getInsuranceIdOld());
leave.setDoStatusInsurance(CommonConstants.ONE_STRING);
leave.setCloseRemarkInsurance(closeRemark);
}
}
} }
// 批量处理商险明细表的状态为失败: // 批量处理商险明细表的状态为失败:
if (!errorList.isEmpty()) { if (!errorList.isEmpty()) {
// 可以再将【3商险:加一重保险】里无需处理的部分摘出来,改为无需处理,也可以不变,不影响总状态
leaveInsuranceMapper.updateLeaveInsuranceListByIdAndStatus(CommonConstants.THREE_STRING, errorList); leaveInsuranceMapper.updateLeaveInsuranceListByIdAndStatus(CommonConstants.THREE_STRING, errorList);
} }
if (!successList.isEmpty()) { if (!successList.isEmpty()) {
...@@ -1451,6 +1508,39 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1451,6 +1508,39 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
} }
} }
} }
// 4合同:加一重保险:失败的再查一下是否已完结,变为无需处理
String contractId = "";
String contractIdEnd = "";
for (EmployeeRegistrationLeave leave : leaveList) {
// 判断了不等于 空、无需处理、完成,再去查合同
if (judgeToQueryContract(isExit, doType, nowTime, leave) ) {
paramVo = new BaseSearchVO();
paramVo.setEmpIdCard(leave.getEmpIdcard());
paramVo.setDeptNo(leave.getDeptNo());
returnR = archivesDaprUtil.getEmpAndContractStatus(paramVo);
if (null != returnR && Common.isNotNull(returnR.getData())) {
returnVo = returnR.getData();
if (Common.isNotNull(returnVo.getResultIdThree())) {
contractId = returnVo.getResultIdThree();
}
if (Common.isNotNull(returnVo.getResultIdFourStatus())) {
contractIdEnd = returnVo.getResultIdFourStatus();
}
}
if (Common.isEmpty(contractId)) {
if (Common.isNotNull(contractIdEnd)) {
leave.setContractId(contractIdEnd);
} else {
// errorInfo.append("未找到终止的合同!")
// 社保派减,同步减合同,是没有终止的合同的,而是在合同本身改状态
leave.setContractId(leave.getContractIdOld());
}
leave.setDoStatusContract(CommonConstants.ONE_STRING);
leave.setCloseRemarkContract(closeRemark);
}
}
}
// 项目-完成 // 项目-完成
if (!listParamProject.isEmpty()) { if (!listParamProject.isEmpty()) {
projectParamList = new ArrayList<>(); projectParamList = new ArrayList<>();
...@@ -1488,6 +1578,22 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1488,6 +1578,22 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave.setDoStatusProject(CommonConstants.EIGHT_STRING); leave.setDoStatusProject(CommonConstants.EIGHT_STRING);
} }
} }
// 5项目档案:加一重保险:失败的再查一下是否已完结,变为无需处理
if (CommonConstants.NINE_STRING.equals(leave.getDoStatusProject())) {
paramVo = new BaseSearchVO();
paramVo.setEmpIdCard(leave.getEmpIdcard());
paramVo.setDeptNo(leave.getDeptNo());
returnR = archivesDaprUtil.getEmpAndContractStatus(paramVo);
if (null != returnR && Common.isNotNull(returnR.getData())) {
returnVo = returnR.getData();
if (Common.isEmpty(returnVo.getResultIdTwo())) {
leave.setEmpProjectId(leave.getEmpIdOld());
leave.setCloseRemarkEmpProject(closeRemark);
leave.setDoStatusProject(CommonConstants.ONE_STRING);
}
}
}
} }
} else { } else {
// 全部成功 // 全部成功
...@@ -1538,6 +1644,21 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1538,6 +1644,21 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave.setDoStatusEmp(CommonConstants.EIGHT_STRING); leave.setDoStatusEmp(CommonConstants.EIGHT_STRING);
} }
} }
// 6人员档案:加一重保险:失败的再查一下是否已完结,变为无需处理
if (CommonConstants.NINE_STRING.equals(leave.getDoStatusProject())) {
paramVo = new BaseSearchVO();
paramVo.setEmpIdCard(leave.getEmpIdcard());
paramVo.setDeptNo(leave.getDeptNo());
returnR = archivesDaprUtil.getEmpAndContractStatus(paramVo);
if (null != returnR && Common.isNotNull(returnR.getData())) {
returnVo = returnR.getData();
if (Common.isEmpty(returnVo.getResultIdOne())) {
leave.setEmpId(leave.getEmpIdOld());
leave.setCloseRemarkEmp(closeRemark);
leave.setDoStatusEmp(CommonConstants.ONE_STRING);
}
}
}
} }
} else { } else {
// 全部成功 // 全部成功
...@@ -1595,6 +1716,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1595,6 +1716,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
); );
} }
// 判断是否要发起
private boolean judgeToUpdateContract(String isExit, String doType, LocalDateTime nowTime, EmployeeRegistrationLeave leave) { private boolean judgeToUpdateContract(String isExit, String doType, LocalDateTime nowTime, EmployeeRegistrationLeave leave) {
return (Common.isEmpty(doType) || doType.contains(CommonConstants.FOUR_STRING)) return (Common.isEmpty(doType) || doType.contains(CommonConstants.FOUR_STRING))
&& Common.isNotNull(leave.getContractIdOld()) && (CommonConstants.ZERO_STRING.equals(isExit) && Common.isNotNull(leave.getContractIdOld()) && (CommonConstants.ZERO_STRING.equals(isExit)
...@@ -1606,6 +1728,17 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1606,6 +1728,17 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
); );
} }
// 判断是否要关闭为无需处理
private boolean judgeToQueryContract(String isExit, String doType, LocalDateTime nowTime, EmployeeRegistrationLeave leave) {
return (Common.isEmpty(doType) || doType.contains(CommonConstants.FOUR_STRING))
&& Common.isNotNull(leave.getContractIdOld()) && (CommonConstants.ZERO_STRING.equals(isExit)
|| (CommonConstants.ONE_STRING.equals(isExit) && Common.isNotNull(leave.getContractExpectedTime()) && leave.getContractExpectedTime().isBefore(nowTime)))
&& Common.isNotNull(leave.getDoStatusContract())
&& !leave.getDoStatusContract().equals(CommonConstants.ZERO_STRING)
&& !leave.getDoStatusContract().equals(CommonConstants.ONE_STRING)
&& !leave.getDoStatusContract().equals(CommonConstants.EIGHT_STRING);
}
private boolean judgeToUpdateSocial(String isExit, String doType, LocalDateTime nowTime, EmployeeRegistrationLeave leave) { private boolean judgeToUpdateSocial(String isExit, String doType, LocalDateTime nowTime, EmployeeRegistrationLeave leave) {
return (Common.isEmpty(doType) || doType.contains(CommonConstants.ONE_STRING)) return (Common.isEmpty(doType) || doType.contains(CommonConstants.ONE_STRING))
&& Common.isNotNull(leave.getSocialDispatchIdOld()) && (CommonConstants.ZERO_STRING.equals(isExit) && Common.isNotNull(leave.getSocialDispatchIdOld()) && (CommonConstants.ZERO_STRING.equals(isExit)
......
...@@ -743,7 +743,7 @@ public class SocialFriendConfig { ...@@ -743,7 +743,7 @@ public class SocialFriendConfig {
// sfsjgb是否是机关保 - 非必填,默认否(陈红给的表里是空的,不推送。) // sfsjgb是否是机关保 - 非必填,默认否(陈红给的表里是空的,不推送。)
// 徽州新字段:sbjbqy社保经办区域 - 社保必填 // 徽州新字段:sbjbqy社保经办区域 - 社保必填
tszdxx.put("sbjbqy", "安徽省|黄山市|徽州区"); tszdxx.put("sbjbqy", "徽州区");
// 徽州新字段:htqdlb合同签订类别 - 社保必填 // 徽州新字段:htqdlb合同签订类别 - 社保必填
tszdxx.put("htqdlb", "新签"); tszdxx.put("htqdlb", "新签");
......
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