diff --git a/src/main/java/com/ydool/staff/controller/PersonnelController.java b/src/main/java/com/ydool/staff/controller/PersonnelController.java index f89535b..b316eef 100644 --- a/src/main/java/com/ydool/staff/controller/PersonnelController.java +++ b/src/main/java/com/ydool/staff/controller/PersonnelController.java @@ -223,6 +223,13 @@ public class PersonnelController extends BaseController { return personnelService.updatePersonnelRetire(id); } + @GetMapping("handlingResignationEvents") + @ApiOperation(value = "处理离职事件") + @ApiImplicitParam(name = "id", value = "人员id") + public AjaxResult handlingResignationEvents(String id) { + return personnelService.handlingResignationEvents(id); + } + @GetMapping("retirementList") @ApiOperation(value = "退休名单") @ApiImplicitParams({ diff --git a/src/main/java/com/ydool/staff/dto/PersonnelDto.java b/src/main/java/com/ydool/staff/dto/PersonnelDto.java index 01c8e7f..d0dfb64 100644 --- a/src/main/java/com/ydool/staff/dto/PersonnelDto.java +++ b/src/main/java/com/ydool/staff/dto/PersonnelDto.java @@ -62,5 +62,8 @@ public class PersonnelDto { @ApiModelProperty(value = "退休状态") private String retireState; + @ApiModelProperty(value = "是否办理离职") + private Boolean whetherIsQuit; + } diff --git a/src/main/java/com/ydool/staff/entity/Personnel.java b/src/main/java/com/ydool/staff/entity/Personnel.java index 90aeb7b..320061d 100644 --- a/src/main/java/com/ydool/staff/entity/Personnel.java +++ b/src/main/java/com/ydool/staff/entity/Personnel.java @@ -168,9 +168,10 @@ public class Personnel extends BaseEntity { @ApiModelProperty(value = "数据状态:0:历史数据 ,1:暂存数据,2:当前数据") private String state; - @ApiModelProperty(value = "是否退休列表") + @ApiModelProperty(value = "是否办理退休") private Boolean isInfo; - + @ApiModelProperty(value = "是否办理离职") + private Boolean whetherIsQuit; } diff --git a/src/main/java/com/ydool/staff/service/IPersonnelService.java b/src/main/java/com/ydool/staff/service/IPersonnelService.java index 17a6c76..32fc74c 100644 --- a/src/main/java/com/ydool/staff/service/IPersonnelService.java +++ b/src/main/java/com/ydool/staff/service/IPersonnelService.java @@ -76,5 +76,7 @@ public interface IPersonnelService { AjaxResult updatePersonnelRetire(String id); AjaxResult retirementList(Page page, String userName, String presentDept, String personnelType, String workState, String orderBy, String column); + + AjaxResult handlingResignationEvents(String id); } 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 12315d1..b4c6495 100644 --- a/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java @@ -6,10 +6,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.DesensitizedUtil; -import cn.hutool.core.util.IdcardUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -949,6 +946,9 @@ public class PersonnelServiceImpl extends BaseService wrapper = new QueryWrapper<>();