Commit fa1e0bc3 authored by huyuchen's avatar huyuchen

优化修改

parent 817704a8
...@@ -1658,6 +1658,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1658,6 +1658,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeProject.setProjectStatus(CommonConstants.ONE_INT); tEmployeeProject.setProjectStatus(CommonConstants.ONE_INT);
tEmployeeProject.setLeaveRemark("终止合同联动减项"); tEmployeeProject.setLeaveRemark("终止合同联动减项");
tEmployeeProject.setLeaveTime(LocalDateTime.now()); tEmployeeProject.setLeaveTime(LocalDateTime.now());
tEmployeeProject.setLeaveUser(user.getNickname());
workInfo.append("减项成功,"); workInfo.append("减项成功,");
} else { } else {
failueInfo.append("存在社保/公积金,无法减项"); failueInfo.append("存在社保/公积金,无法减项");
...@@ -1688,7 +1689,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1688,7 +1689,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if (tEmployeeInfo.getProjectNum() == CommonConstants.ZERO_INT) { if (tEmployeeInfo.getProjectNum() == CommonConstants.ZERO_INT) {
//减档 //减档
tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]); tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
tEmployeeInfo.setLeaveRemark(tEmployeeProject.getLeaveRemark()); tEmployeeInfo.setLeaveRemark("社保派减联动减档");
tEmployeeInfo.setLeaveTime(DateUtil.getCurrentDateTime()); tEmployeeInfo.setLeaveTime(DateUtil.getCurrentDateTime());
tEmployeeInfo.setLeaveUser(user.getId()); tEmployeeInfo.setLeaveUser(user.getId());
tEmployeeInfo.setLeaveUserName(user.getNickname()); tEmployeeInfo.setLeaveUserName(user.getNickname());
......
...@@ -1483,8 +1483,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1483,8 +1483,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
(tEmployeeProject.getFundStatus() == CommonConstants.ZERO_INT (tEmployeeProject.getFundStatus() == CommonConstants.ZERO_INT
|| tEmployeeProject.getFundStatus() == CommonConstants.THREE_INT)) { || tEmployeeProject.getFundStatus() == CommonConstants.THREE_INT)) {
tEmployeeProject.setProjectStatus(CommonConstants.ONE_INT); tEmployeeProject.setProjectStatus(CommonConstants.ONE_INT);
tEmployeeProject.setLeaveRemark("终止合同联动减项"); tEmployeeProject.setLeaveRemark("社保派减联动减项");
tEmployeeProject.setLeaveTime(LocalDateTime.now()); tEmployeeProject.setLeaveTime(LocalDateTime.now());
tEmployeeProject.setLeaveUser(vo.getUserName());
workInfo.append("减项成功,"); workInfo.append("减项成功,");
} else { } else {
failueInfo.append("存在社保/公积金,无法减项"); failueInfo.append("存在社保/公积金,无法减项");
...@@ -1516,7 +1517,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1516,7 +1517,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if (tEmployeeInfo.getProjectNum() == CommonConstants.ZERO_INT) { if (tEmployeeInfo.getProjectNum() == CommonConstants.ZERO_INT) {
//减档 //减档
tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]); tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
tEmployeeInfo.setLeaveRemark(tEmployeeProject.getLeaveRemark()); tEmployeeInfo.setLeaveRemark("社保派减联动减档");
tEmployeeInfo.setLeaveTime(DateUtil.getCurrentDateTime()); tEmployeeInfo.setLeaveTime(DateUtil.getCurrentDateTime());
tEmployeeInfo.setLeaveUser(vo.getUserId()); tEmployeeInfo.setLeaveUser(vo.getUserId());
tEmployeeInfo.setLeaveUserName(vo.getUserName()); tEmployeeInfo.setLeaveUserName(vo.getUserName());
......
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