Commit f721dda7 authored by fangxinjiang's avatar fangxinjiang

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

parents 9325f732 5fb32565
...@@ -617,8 +617,12 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -617,8 +617,12 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeContractInfo.setContractEnd(null); tEmployeeContractInfo.setContractEnd(null);
baseMapper.updateContractEnd(tEmployeeContractInfo); baseMapper.updateContractEnd(tEmployeeContractInfo);
} }
if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.TWO_INT) {
return R.ok(null, CommonConstants.SAVE_AND_UPDATE);
} else {
return R.ok(null, CommonConstants.SAVE_SUCCESS); return R.ok(null, CommonConstants.SAVE_SUCCESS);
} }
}
/** /**
* @Author fxj * @Author fxj
......
...@@ -4769,11 +4769,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -4769,11 +4769,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if (Common.isNotNull(contractId)) { if (Common.isNotNull(contractId)) {
returnVo.setResultIdThree(contractId); returnVo.setResultIdThree(contractId);
returnVo.setResultIdThreeStatus("可用"); returnVo.setResultIdThreeStatus("可用");
} else {
// 如果没有可用的,查找终止的,放在离职待办的详情里
contractId = contractServicer.getContractByEmpIdCardAndDeptNoByEnd(paramVo.getEmpIdCard(), paramVo.getDeptNo());
returnVo.setResultIdFour(contractId);
} }
// 如果没有可用的,查找终止的,放在离职待办的详情里
String contractEndId = contractServicer.getContractByEmpIdCardAndDeptNoByEnd(paramVo.getEmpIdCard(), paramVo.getDeptNo());
returnVo.setResultIdFourStatus(contractEndId);
} }
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 = "更新成功!";
......
...@@ -139,6 +139,10 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -139,6 +139,10 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
searchVo.setAuthSql(null); searchVo.setAuthSql(null);
//获取项目信息 //获取项目信息
R<TSettleDomainRegistListVo> domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername()); R<TSettleDomainRegistListVo> 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 {
domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername());
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 {
...@@ -146,6 +150,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -146,6 +150,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
} }
} }
} }
}
private boolean haveRole(YifuUser user) { private boolean haveRole(YifuUser user) {
List<Long> roleList = user.getClientRoleMap().get(ClientNameConstants.CLIENT_MVP); List<Long> roleList = user.getClientRoleMap().get(ClientNameConstants.CLIENT_MVP);
...@@ -602,19 +607,20 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -602,19 +607,20 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
logInfo.append("无需处理标记:"); logInfo.append("无需处理标记:");
if (doTypeWu.contains(CommonConstants.THREE_STRING)) { if (doTypeWu.contains(CommonConstants.THREE_STRING)) {
logInfo.append("商险;"); logInfo.append("商险;");
if (!CommonConstants.ONE_STRING.equals(leave.getDoStatusInsurance()) if (CommonConstants.TWO_STRING.equals(leave.getDoStatusInsurance())
&& !CommonConstants.EIGHT_STRING.equals(leave.getDoStatusInsurance())) { || CommonConstants.THREE_STRING.equals(leave.getDoStatusInsurance())
|| CommonConstants.NINE_STRING.equals(leave.getDoStatusInsurance())) {
leave.setInsuranceId(leave.getInsuranceIdOld()); leave.setInsuranceId(leave.getInsuranceIdOld());
leave.setCloseRemarkInsurance(remark); leave.setCloseRemarkInsurance(remark);
leave.setDoStatusInsurance(CommonConstants.ONE_STRING); leave.setDoStatusInsurance(CommonConstants.ONE_STRING);
} else { } else {
errorInfo.append("商险状态已完结,不可无需处理!"); errorInfo.append("商险状态已处理,不可手动关闭!");
} }
} }
if (doTypeWu.contains(CommonConstants.SIX_STRING)) { if (doTypeWu.contains(CommonConstants.SIX_STRING)) {
logInfo.append("人员档案;"); logInfo.append("人员档案;");
if (!CommonConstants.ONE_STRING.equals(leave.getDoStatusEmp()) if (CommonConstants.TWO_STRING.equals(leave.getDoStatusEmp())
&& !CommonConstants.EIGHT_STRING.equals(leave.getDoStatusEmp())) { || CommonConstants.NINE_STRING.equals(leave.getDoStatusEmp())) {
leave.setEmpId(leave.getEmpIdOld()); leave.setEmpId(leave.getEmpIdOld());
leave.setCloseRemarkEmp(remark); leave.setCloseRemarkEmp(remark);
leave.setDoStatusEmp(CommonConstants.ONE_STRING); leave.setDoStatusEmp(CommonConstants.ONE_STRING);
...@@ -631,7 +637,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -631,7 +637,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
errorInfo.append("人员当下非多项目,不可无需处理!"); errorInfo.append("人员当下非多项目,不可无需处理!");
} }
} else { } else {
errorInfo.append("人员档案状态已完结,不可无需处理!"); errorInfo.append("人员状态已处理,不可手动关闭!");
} }
} }
...@@ -715,7 +721,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -715,7 +721,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())
...@@ -728,7 +734,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -728,7 +734,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave.setDoStatusContract(CommonConstants.ONE_STRING); leave.setDoStatusContract(CommonConstants.ONE_STRING);
leave.setCloseRemarkContract(closeRemark); leave.setCloseRemarkContract(closeRemark);
} else { } else {
errorInfo.append("未找到终止的合同!"); // errorInfo.append("未找到终止的合同!")
// 社保派减,同步减合同,是没有终止的合同的,而是在合同本身改状态
leave.setContractId(leave.getContractIdOld());
leave.setDoStatusContract(CommonConstants.ONE_STRING);
leave.setCloseRemarkContract(closeRemark);
} }
} }
} else { } else {
...@@ -1406,9 +1416,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1406,9 +1416,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 +1432,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1419,6 +1432,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());
......
...@@ -1854,11 +1854,16 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1854,11 +1854,16 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
R<TSettleDomainRegistListVo> domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername()); R<TSettleDomainRegistListVo> domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername());
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 {
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 { } else {
searchVo.setId(CommonConstants.ONE_STRING_NEGATE); searchVo.setId(CommonConstants.ONE_STRING_NEGATE);
} }
} }
} }
}
public boolean haveRole(YifuUser user, long roleId) { public boolean haveRole(YifuUser user, long roleId) {
List<Long> roleList = user.getClientRoleMap().get(ClientNameConstants.CLIENT_MVP); List<Long> roleList = user.getClientRoleMap().get(ClientNameConstants.CLIENT_MVP);
......
...@@ -157,6 +157,10 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper, ...@@ -157,6 +157,10 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
searchVo.setAuthSql(null); searchVo.setAuthSql(null);
//获取项目信息 //获取项目信息
R<TSettleDomainRegistListVo> domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername()); R<TSettleDomainRegistListVo> 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 {
domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername());
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 {
...@@ -164,6 +168,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper, ...@@ -164,6 +168,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
} }
} }
} }
}
public boolean haveRole(YifuUser user, long roleId) { public boolean haveRole(YifuUser user, long roleId) {
List<Long> roleList = user.getClientRoleMap().get(ClientNameConstants.CLIENT_MVP); List<Long> roleList = user.getClientRoleMap().get(ClientNameConstants.CLIENT_MVP);
......
...@@ -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