Commit 2af63660 authored by huyuchen's avatar huyuchen

优化修改

parent 92ef288c
...@@ -1089,6 +1089,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1089,6 +1089,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
for (TEmployeeProject delProject : list) { for (TEmployeeProject delProject : list) {
++i; ++i;
try { try {
if (delProject.getContractStatus() == CommonConstants.dingleDigitIntArray[1] ||
delProject.getInsuranceStatus() != CommonConstants.dingleDigitIntArray[0] ||
delProject.getSocialStatus() != CommonConstants.dingleDigitIntArray[0] ||
delProject.getFundStatus() != CommonConstants.dingleDigitIntArray[0]) {
errorList.add(new ErrorMessage(i, delProject.getEmpName() + ";" +
delProject.getEmpIdcard() + ";" + delProject.getDeptNo() + ";" + "人员在该项目下存在进行中/未完结的服务,禁止删除"));
}
if (CommonConstants.dingleDigitIntArray[0] == delProject.getStatus()) { if (CommonConstants.dingleDigitIntArray[0] == delProject.getStatus()) {
delProject.setDeleteFlag(CommonConstants.ONE_STRING); delProject.setDeleteFlag(CommonConstants.ONE_STRING);
updList.add(delProject); updList.add(delProject);
......
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