Commit 2c4c4e1f authored by hongguangwu's avatar hongguangwu

MVP1.7.17-离职待办-派单暂存

parent a42fe908
...@@ -1064,6 +1064,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1064,6 +1064,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
// 单一离职待办里的商险 // 单一离职待办里的商险
List<String> insuranceList; List<String> insuranceList;
String[] insuranceArr; String[] insuranceArr;
String errorMessage;
for (EmployeeRegistrationLeave leave : leaveList) { for (EmployeeRegistrationLeave leave : leaveList) {
i++; i++;
if ((Common.isEmpty(doType) || doType.contains(CommonConstants.ONE_STRING)) if ((Common.isEmpty(doType) || doType.contains(CommonConstants.ONE_STRING))
...@@ -1192,7 +1193,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1192,7 +1193,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave.setDoStatusSocial(CommonConstants.FOUR_STRING); leave.setDoStatusSocial(CommonConstants.FOUR_STRING);
} else if (errorMap.get(leave.getId()) != null) { } else if (errorMap.get(leave.getId()) != null) {
// 失败 // 失败
leave.setFailSocialRemark(errorMap.get(leave.getId())); errorMessage = errorMap.get(leave.getId());
if (Common.isNotNull(errorMessage) && errorMessage.length() > 300) {
errorMessage = errorMessage.substring(0, 300);
}
leave.setFailSocialRemark(errorMessage);
leave.setFailSocialTime(LocalDateTime.now()); leave.setFailSocialTime(LocalDateTime.now());
leave.setDoStatusSocial(CommonConstants.THREE_STRING); leave.setDoStatusSocial(CommonConstants.THREE_STRING);
} }
...@@ -1228,7 +1233,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1228,7 +1233,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave.setDoStatusFund(CommonConstants.FOUR_STRING); leave.setDoStatusFund(CommonConstants.FOUR_STRING);
} else if (errorMap.get(leave.getId()) != null) { } else if (errorMap.get(leave.getId()) != null) {
// 失败 // 失败
leave.setFailFundRemark(errorMap.get(leave.getId())); errorMessage = errorMap.get(leave.getId());
if (Common.isNotNull(errorMessage) && errorMessage.length() > 300) {
errorMessage = errorMessage.substring(0, 300);
}
leave.setFailFundRemark(errorMessage);
leave.setFailFundTime(LocalDateTime.now()); leave.setFailFundTime(LocalDateTime.now());
leave.setDoStatusFund(CommonConstants.THREE_STRING); leave.setDoStatusFund(CommonConstants.THREE_STRING);
} }
...@@ -1277,7 +1286,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1277,7 +1286,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
} }
if (errorMsg.length() > CommonConstants.ZERO_INT) { if (errorMsg.length() > CommonConstants.ZERO_INT) {
leave.setFailInsuranceUser(userName); leave.setFailInsuranceUser(userName);
leave.setFailInsuranceRemark(errorMsg.toString()); errorMessage = errorMsg.toString();
if (Common.isNotNull(errorMessage) && errorMessage.length() > 300) {
errorMessage = errorMessage.substring(0, 300);
}
leave.setFailInsuranceRemark(errorMessage);
leave.setFailInsuranceTime(LocalDateTime.now()); leave.setFailInsuranceTime(LocalDateTime.now());
leave.setDoStatusInsurance(CommonConstants.THREE_STRING); leave.setDoStatusInsurance(CommonConstants.THREE_STRING);
} else { } else {
...@@ -1334,7 +1347,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1334,7 +1347,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave.setDoStatusContract(CommonConstants.FOUR_STRING); leave.setDoStatusContract(CommonConstants.FOUR_STRING);
} else if (errorMap.get(leave.getId()) != null) { } else if (errorMap.get(leave.getId()) != null) {
// 失败 // 失败
leave.setFailContractRemark(errorMap.get(leave.getId())); errorMessage = errorMap.get(leave.getId());
if (Common.isNotNull(errorMessage) && errorMessage.length() > 300) {
errorMessage = errorMessage.substring(0, 300);
}
leave.setFailContractRemark(errorMessage);
leave.setFailContractTime(LocalDateTime.now()); leave.setFailContractTime(LocalDateTime.now());
leave.setDoStatusContract(CommonConstants.THREE_STRING); leave.setDoStatusContract(CommonConstants.THREE_STRING);
} }
...@@ -1358,7 +1375,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1358,7 +1375,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
} }
for (EmployeeRegistrationLeave leave : leaveList) { for (EmployeeRegistrationLeave leave : leaveList) {
if (errorMap.get(leave.getId()) != null) { if (errorMap.get(leave.getId()) != null) {
leave.setFailEmpProjectRemark(errorMap.get(leave.getId())); errorMessage = errorMap.get(leave.getId());
if (Common.isNotNull(errorMessage) && errorMessage.length() > 300) {
errorMessage = errorMessage.substring(0, 300);
}
leave.setFailEmpProjectRemark(errorMessage);
leave.setFailEmpProjectTime(LocalDateTime.now()); leave.setFailEmpProjectTime(LocalDateTime.now());
leave.setDoStatusProject(CommonConstants.NINE_STRING); leave.setDoStatusProject(CommonConstants.NINE_STRING);
} else { } else {
...@@ -1392,7 +1413,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1392,7 +1413,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
} }
for (EmployeeRegistrationLeave leave : leaveList) { for (EmployeeRegistrationLeave leave : leaveList) {
if (errorMap.get(leave.getId()) != null) { if (errorMap.get(leave.getId()) != null) {
leave.setFailEmpRemark(errorMap.get(leave.getId())); errorMessage = errorMap.get(leave.getId());
if (Common.isNotNull(errorMessage) && errorMessage.length() > 300) {
errorMessage = errorMessage.substring(0, 300);
}
leave.setFailEmpRemark(errorMessage);
leave.setFailEmpTime(LocalDateTime.now()); leave.setFailEmpTime(LocalDateTime.now());
leave.setDoStatusEmp(CommonConstants.NINE_STRING); leave.setDoStatusEmp(CommonConstants.NINE_STRING);
} else { } else {
......
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