Commit a25680dd authored by hongguangwu's avatar hongguangwu

MVP1.7.17-2000改为5条

parent afce3123
...@@ -617,7 +617,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -617,7 +617,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeContractInfo.setContractEnd(null); tEmployeeContractInfo.setContractEnd(null);
baseMapper.updateContractEnd(tEmployeeContractInfo); baseMapper.updateContractEnd(tEmployeeContractInfo);
} }
return R.ok(null, CommonConstants.SAVE_SUCCESS); if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.TWO_INT) {
return R.ok(null, CommonConstants.SAVE_AND_UPDATE);
} else {
return R.ok(null, CommonConstants.SAVE_SUCCESS);
}
} }
/** /**
......
...@@ -4772,7 +4772,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -4772,7 +4772,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} else { } else {
// 如果没有可用的,查找终止的,放在离职待办的详情里 // 如果没有可用的,查找终止的,放在离职待办的详情里
contractId = contractServicer.getContractByEmpIdCardAndDeptNoByEnd(paramVo.getEmpIdCard(), paramVo.getDeptNo()); contractId = contractServicer.getContractByEmpIdCardAndDeptNoByEnd(paramVo.getEmpIdCard(), paramVo.getDeptNo());
returnVo.setResultIdFour(contractId); returnVo.setResultIdFourStatus(contractId);
} }
} }
return returnVo; return returnVo;
......
...@@ -329,6 +329,8 @@ public interface CommonConstants { ...@@ -329,6 +329,8 @@ public interface CommonConstants {
String RESULT_DATA_SUCESS= "操作成功"; String RESULT_DATA_SUCESS= "操作成功";
String SAVE_SUCCESS = "保存成功!"; String SAVE_SUCCESS = "保存成功!";
// 保存并审核通过-合同专用,离职待办同步使用
String SAVE_AND_UPDATE = "保存成功!!";
String UPDATE_SUCCESS = "更新成功!"; String UPDATE_SUCCESS = "更新成功!";
......
...@@ -142,7 +142,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -142,7 +142,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && !domainR.getData().getDeptNos().isEmpty()) { if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && !domainR.getData().getDeptNos().isEmpty()) {
searchVo.setDeptNoList(domainR.getData().getDeptNos()); searchVo.setDeptNoList(domainR.getData().getDeptNos());
} else { } else {
searchVo.setId(CommonConstants.ONE_STRING_NEGATE); domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername());
if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && !domainR.getData().getDeptNos().isEmpty()) {
searchVo.setDeptNoList(domainR.getData().getDeptNos());
} else {
searchVo.setId(CommonConstants.ONE_STRING_NEGATE);
}
} }
} }
} }
...@@ -715,7 +720,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -715,7 +720,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
returnVo = returnR.getData(); returnVo = returnR.getData();
if (Common.isNotNull(returnVo.getResultIdThree())) { if (Common.isNotNull(returnVo.getResultIdThree())) {
contractId = returnVo.getResultIdThree(); contractId = returnVo.getResultIdThree();
contractIdEnd = returnVo.getResultIdFour(); contractIdEnd = returnVo.getResultIdFourStatus();
} }
} }
if (!CommonConstants.ONE_STRING.equals(leave.getDoStatusContract()) if (!CommonConstants.ONE_STRING.equals(leave.getDoStatusContract())
...@@ -1406,9 +1411,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1406,9 +1411,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
Map<String, String> errorMap = new HashMap<>(); Map<String, String> errorMap = new HashMap<>();
// 存放成功的新ID // 存放成功的新ID
Map<String, String> successMap = new HashMap<>(); Map<String, String> successMap = new HashMap<>();
Map<String, String> successAndAuditMap = new HashMap<>();
for (ErrorMessage message : contractParamList) { for (ErrorMessage message : contractParamList) {
if (CommonConstants.SAVE_SUCCESS.equals(message.getMessage())) { if (CommonConstants.SAVE_SUCCESS.equals(message.getMessage())) {
successMap.put(message.getKey(), message.getName()); successMap.put(message.getKey(), message.getName());
} else if (CommonConstants.SAVE_AND_UPDATE.equals(message.getMessage())) {
successAndAuditMap.put(message.getKey(), message.getName());
} else { } else {
errorMap.put(message.getKey(), message.getMessage()); errorMap.put(message.getKey(), message.getMessage());
} }
...@@ -1419,6 +1427,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1419,6 +1427,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
if (successMap.get(leave.getId()) != null) { if (successMap.get(leave.getId()) != null) {
leave.setContractId(successMap.get(leave.getId())); leave.setContractId(successMap.get(leave.getId()));
leave.setDoStatusContract(CommonConstants.FOUR_STRING); leave.setDoStatusContract(CommonConstants.FOUR_STRING);
} else if (successAndAuditMap.get(leave.getId()) != null) {
leave.setContractId(successAndAuditMap.get(leave.getId()));
leave.setDoStatusContract(CommonConstants.EIGHT_STRING);
} else if (errorMap.get(leave.getId()) != null) { } else if (errorMap.get(leave.getId()) != null) {
// 失败 // 失败
errorMessage = errorMap.get(leave.getId()); errorMessage = errorMap.get(leave.getId());
......
...@@ -1855,7 +1855,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1855,7 +1855,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && domainR.getData().getDeptNos().size() > 0) { if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && domainR.getData().getDeptNos().size() > 0) {
searchVo.setDeptNoList(domainR.getData().getDeptNos()); searchVo.setDeptNoList(domainR.getData().getDeptNos());
} else { } else {
searchVo.setId(CommonConstants.ONE_STRING_NEGATE); domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername());
if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && !domainR.getData().getDeptNos().isEmpty()) {
searchVo.setDeptNoList(domainR.getData().getDeptNos());
} else {
searchVo.setId(CommonConstants.ONE_STRING_NEGATE);
}
} }
} }
} }
......
...@@ -473,7 +473,7 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh ...@@ -473,7 +473,7 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
</if> </if>
</where> </where>
ORDER BY b.create_time desc,b.id asc ORDER BY b.create_time desc,b.id asc
limit 5 limit 2000
</select> </select>
<!--离职确认列表--> <!--离职确认列表-->
<select id="getEmployeeRegistrationLeaveConfirmTablePage" resultMap="tableAndExportMap"> <select id="getEmployeeRegistrationLeaveConfirmTablePage" resultMap="tableAndExportMap">
......
...@@ -160,7 +160,12 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper, ...@@ -160,7 +160,12 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && !domainR.getData().getDeptNos().isEmpty()) { if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && !domainR.getData().getDeptNos().isEmpty()) {
searchVo.setDeptNoList(domainR.getData().getDeptNos()); searchVo.setDeptNoList(domainR.getData().getDeptNos());
} else { } else {
searchVo.setId(CommonConstants.ONE_STRING_NEGATE); domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername());
if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && !domainR.getData().getDeptNos().isEmpty()) {
searchVo.setDeptNoList(domainR.getData().getDeptNos());
} else {
searchVo.setId(CommonConstants.ONE_STRING_NEGATE);
}
} }
} }
} }
......
...@@ -2225,7 +2225,7 @@ ...@@ -2225,7 +2225,7 @@
a.id a.id
from from
t_insurance_detail a t_insurance_detail a
where a.DELETE_FLAG = 0 and a.REDUCE_HANDLE_STATUS != 4 where a.DELETE_FLAG = 0 and (a.REDUCE_HANDLE_STATUS is null or a.REDUCE_HANDLE_STATUS != 4)
and a.EMP_IDCARD_NO = #{empIdCard} and a.EMP_IDCARD_NO = #{empIdCard}
and a.DEPT_NO = #{deptNo} and a.DEPT_NO = #{deptNo}
......
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