Commit ad75c249 authored by wangzb's avatar wangzb

feature-wzb :项目档案批量减项

parent 300cc145
......@@ -604,6 +604,10 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
errorMessage.append(";");
errorMessage.append(leaveReason);
errorMessage.append(";");
if (Common.isEmpty(excel.getLeaveRemark())) {
errorMessage.append("");
errorMessage.append(";");
}
if (Common.isNotNull(excel.getLeaveRemark())) {
errorMessage.append(excel.getLeaveRemark());
errorMessage.append(";");
......@@ -636,7 +640,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
if (Common.isNotNull(errorTemp.toString())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMessage +errorTemp.substring(0,errorTemp.length()-1) +",禁止减项"));
break;
continue;
}
tEmployeeProjectOld = this.getById(tEmployeeProject.getId());
tEmployeeProject.setProjectStatus(CommonConstants.dingleDigitIntArray[1]);
......
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