diff --git a/src/main/java/com/ydool/staff/controller/ExchangeController.java b/src/main/java/com/ydool/staff/controller/ExchangeController.java index 2085757..8247e98 100644 --- a/src/main/java/com/ydool/staff/controller/ExchangeController.java +++ b/src/main/java/com/ydool/staff/controller/ExchangeController.java @@ -78,4 +78,5 @@ public class ExchangeController extends BaseController { return exchangeService.deleteExchangeById(ids); } + } diff --git a/src/main/java/com/ydool/staff/entity/AuditLog.java b/src/main/java/com/ydool/staff/entity/AuditLog.java index 4aa1201..93b1b4a 100644 --- a/src/main/java/com/ydool/staff/entity/AuditLog.java +++ b/src/main/java/com/ydool/staff/entity/AuditLog.java @@ -35,4 +35,7 @@ public class AuditLog extends BaseEntity{ @ApiModelProperty(value = "处理意见") private String opinion; + @ApiModelProperty(value = "日志类型:personnel 人员 change:变更 ") + private String type; + } diff --git a/src/main/java/com/ydool/staff/service/IAuditService.java b/src/main/java/com/ydool/staff/service/IAuditService.java index 6102a6d..6e7250c 100644 --- a/src/main/java/com/ydool/staff/service/IAuditService.java +++ b/src/main/java/com/ydool/staff/service/IAuditService.java @@ -18,7 +18,7 @@ public interface IAuditService { AjaxResult audit(AuditRequest auditRequest); - Integer saveAuditLog(String personnelId,String approverId,String auditSate); + Integer saveAuditLog(String personnelId,String approverId,String type,String auditSate); AjaxResult submitDirectorsSupervisorsAudit(AuditRequest auditRequest); diff --git a/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java index 4c23825..210ea73 100644 --- a/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java @@ -97,9 +97,13 @@ public class AuditServiceImpl extends BaseService implements auditOne.setAuditOrder(ArgsConst.WAITING); updateById(auditOne); Personnel personnel = personnelMapper.selectById(auditOne.getPersonnelId()); - personnel.setAuditState(2); + if (ArgsConst.PERSONNEL.equals(auditRequest.getType())){ + personnel.setAuditState(2); + }else if (ArgsConst.CHANGE.equals(auditRequest.getType())){ + personnel.setChangeAuditState(2); + } personnelMapper.updateById(personnel); - saveAuditLog(auditRequest.getPersonnelId(),loginId,"一般初审通过"); + saveAuditLog(auditRequest.getPersonnelId(),loginId,auditRequest.getType(),"一般初审通过"); } return update ? AjaxResult.ok().msg("审批成功!"):AjaxResult.fail().msg("审批成功!"); } @@ -111,14 +115,20 @@ public class AuditServiceImpl extends BaseService implements one.setAuditState(ArgsConst.PASS); boolean update = updateById(one); if (update){ - saveAuditLog(auditRequest.getPersonnelId(),loginId,"一般终审通过"); + saveAuditLog(auditRequest.getPersonnelId(),loginId,auditRequest.getType(),"一般终审通过"); Personnel personnel = personnelMapper.selectById(auditRequest.getPersonnelId()); PersonnelMiddle middle = personnelMiddleMapper.selectOne(new LambdaQueryWrapper().eq(PersonnelMiddle::getBeforeId, personnel.getId()).eq(PersonnelMiddle::getState, "1")); Personnel personnelOne = personnelMapper.selectById(middle.getAfterId()); String id = personnelOne.getId(); personnelOne.setState("2"); - personnelOne.setAlterationSign("2"); - personnelOne.setAuditState(3); + if (ArgsConst.PERSONNEL.equals(auditRequest.getType())){ + personnelOne.setAlterationSign("2"); + personnelOne.setAuditState(3); + } + if (ArgsConst.CHANGE.equals(auditRequest.getType())){ + personnelOne.setChangeAlterationSign("2"); + personnelOne.setChangeAuditState(3); + } personnelOne.setId(personnel.getId()); personnel.setId(id); personnel.setState("0"); @@ -138,12 +148,13 @@ public class AuditServiceImpl extends BaseService implements Personnel afterPersonnel = personnelMapper.selectById(middle.getAfterId()); Personnel personnel = personnelMapper.selectById(auditRequest.getPersonnelId()); if (loginUser.getLoginName().equals(director.getParamValue())){ + one.setAuditOrder(ArgsConst.REJECT); one.setOpinion(auditRequest.getAuditOpinion()); boolean update = updateById(one); if (update){ - saveAuditLog(auditRequest.getPersonnelId(),loginId,"一般初审拒绝"); - updateByPer(afterPersonnel.getId(),personnel); + saveAuditLog(auditRequest.getPersonnelId(),loginId,auditRequest.getType(),"一般初审拒绝"); + updateByPer(afterPersonnel.getId(),personnel,auditRequest.getType()); for (Audit auditOne : auditList) { delete(auditOne.getId()); } @@ -156,8 +167,8 @@ public class AuditServiceImpl extends BaseService implements one.setOpinion(auditRequest.getAuditOpinion()); boolean update = updateById(one); if (update){ - saveAuditLog(auditRequest.getPersonnelId(),loginId,"一般终审拒绝"); - updateByPer(afterPersonnel.getId(),personnel); + saveAuditLog(auditRequest.getPersonnelId(),loginId,auditRequest.getType(),"一般终审拒绝"); + updateByPer(afterPersonnel.getId(),personnel,auditRequest.getType()); for (Audit auditOne : auditList) { delete(auditOne.getId()); } @@ -167,17 +178,24 @@ public class AuditServiceImpl extends BaseService implements return null; } - public Integer saveAuditLog(String personnelId,String approverId,String auditSate){ + public Integer saveAuditLog(String personnelId,String approverId,String type,String auditSate){ AuditLog auditLog = new AuditLog(); auditLog.setPersonnelId(personnelId); + auditLog.setType(type); auditLog.setApprover(approverId); auditLog.setAuditState(auditSate); return auditLogMapper.insert(auditLog); } - public void updateByPer(String afterId,Personnel personnel){ + public void updateByPer(String afterId,Personnel personnel,String type){ delete(afterId); - personnel.setAuditState(4); - personnel.setAlterationSign("2"); + if (ArgsConst.PERSONNEL.equals(type)){ + personnel.setAuditState(4); + personnel.setAlterationSign("2"); + }else if (ArgsConst.CHANGE.equals(type)){ + personnel.setChangeAuditState(4); + personnel.setChangeAlterationSign("2"); + } + personnelMapper.updateById(personnel); } diff --git a/src/main/java/com/ydool/staff/service/impl/DirectorsSupervisorsServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/DirectorsSupervisorsServiceImpl.java index a3cbedd..6887e3c 100644 --- a/src/main/java/com/ydool/staff/service/impl/DirectorsSupervisorsServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/DirectorsSupervisorsServiceImpl.java @@ -179,7 +179,7 @@ public class DirectorsSupervisorsServiceImpl extends BaseService 0 ? AjaxResult.ok().msg("送审成功!") : AjaxResult.fail().msg("送审失败!"); } } diff --git a/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java index 118121a..4135d6c 100644 --- a/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java @@ -105,7 +105,7 @@ public class OrganizationServiceImpl extends BaseService 0 ? AjaxResult.ok().msg("送审成功!") : AjaxResult.ok().msg("送审失败!"); } @@ -153,7 +153,7 @@ public class OrganizationServiceImpl extends BaseService 0 ? AjaxResult.ok().msg("送审成功!") : AjaxResult.ok().msg("送审失败!"); } } diff --git a/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java index 2c1331c..a630f0e 100644 --- a/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java @@ -550,7 +550,7 @@ public class PersonnelServiceImpl extends BaseService