diff --git a/src/main/java/com/ydool/staff/controller/AlterationController.java b/src/main/java/com/ydool/staff/controller/AlterationController.java index 3d5f237..3663522 100644 --- a/src/main/java/com/ydool/staff/controller/AlterationController.java +++ b/src/main/java/com/ydool/staff/controller/AlterationController.java @@ -33,8 +33,10 @@ public class AlterationController extends BaseController { @GetMapping( "alterationPage") @ApiOperation(value = "变更记录列表") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "员工id")}) - public AjaxResult alterationPage(String id){ - return alterationService.alterationList(id); + @ApiImplicitParam(name = "id", value = "员工id"), + @ApiImplicitParam(name = "personnelType", value = "人员类型:personnel人员 change变更") + }) + public AjaxResult alterationPage(String id,String personnelType){ + return alterationService.alterationList(id,personnelType); } } diff --git a/src/main/java/com/ydool/staff/controller/AuditController.java b/src/main/java/com/ydool/staff/controller/AuditController.java index 661f65f..5e02f8f 100644 --- a/src/main/java/com/ydool/staff/controller/AuditController.java +++ b/src/main/java/com/ydool/staff/controller/AuditController.java @@ -48,9 +48,13 @@ public class AuditController extends BaseController { @GetMapping("audtiLog") @ApiOperation(value = "处理日志",response = AuditLogDto.class) - @ApiImplicitParam(name = "id",value = "员工id") - public AjaxResult audtiLog(String id){ - return auditLogService.auditLog(id); + @ApiImplicitParams({ + @ApiImplicitParam(name = "id",value = "员工id"), + @ApiImplicitParam(name = "personnelType",value = "人员类型:personnel人员 change变更") + }) + + public AjaxResult audtiLog(String id, String personnelType){ + return auditLogService.auditLog(id,personnelType); } diff --git a/src/main/java/com/ydool/staff/controller/PersonnelController.java b/src/main/java/com/ydool/staff/controller/PersonnelController.java index 2dbbc05..a1f0893 100644 --- a/src/main/java/com/ydool/staff/controller/PersonnelController.java +++ b/src/main/java/com/ydool/staff/controller/PersonnelController.java @@ -63,10 +63,11 @@ public class PersonnelController extends BaseController { @ApiOperation(value = "查询一条",response = PersonnelUpdateDto.class) @ApiImplicitParams({ @ApiImplicitParam(name = "id",value = "id" ), - @ApiImplicitParam(name = "type",value = "类型,修改传update,审批传audit" ), + @ApiImplicitParam(name = "type",value = "修改类型,修改传update,审批传audit" ), + @ApiImplicitParam(name = "personnelType",value = "人员类型,人员:personnel,变更change" ), }) - public AjaxResult getById(String id,String type){ - return personnelService.getById(id,type); + public AjaxResult getById(String id,String type,String personnelType){ + return personnelService.getById(id,type,personnelType); } @PostMapping(value = "savePersonnel") diff --git a/src/main/java/com/ydool/staff/service/IAlterationService.java b/src/main/java/com/ydool/staff/service/IAlterationService.java index e732053..d89154c 100644 --- a/src/main/java/com/ydool/staff/service/IAlterationService.java +++ b/src/main/java/com/ydool/staff/service/IAlterationService.java @@ -1,6 +1,5 @@ package com.ydool.staff.service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ydool.common.data.dto.AjaxResult; /** @@ -13,7 +12,7 @@ import com.ydool.common.data.dto.AjaxResult; */ public interface IAlterationService { - AjaxResult alterationList(String id); + AjaxResult alterationList(String id, String personnelType); } diff --git a/src/main/java/com/ydool/staff/service/IAuditLogService.java b/src/main/java/com/ydool/staff/service/IAuditLogService.java index 3e3b702..67f101a 100644 --- a/src/main/java/com/ydool/staff/service/IAuditLogService.java +++ b/src/main/java/com/ydool/staff/service/IAuditLogService.java @@ -12,6 +12,6 @@ import com.ydool.common.data.dto.AjaxResult; */ public interface IAuditLogService { - AjaxResult auditLog(String id); + AjaxResult auditLog(String id, String personnelType); } diff --git a/src/main/java/com/ydool/staff/service/IPersonnelService.java b/src/main/java/com/ydool/staff/service/IPersonnelService.java index d4a918a..6cb20ef 100644 --- a/src/main/java/com/ydool/staff/service/IPersonnelService.java +++ b/src/main/java/com/ydool/staff/service/IPersonnelService.java @@ -29,7 +29,7 @@ public interface IPersonnelService { */ AjaxResult personnelList(Page page , SelectRequest request, String orderBy,String column); - AjaxResult getById(String id,String type); + AjaxResult getById(String id,String type,String personnelType); AjaxResult personnelByExchangeList(); /** diff --git a/src/main/java/com/ydool/staff/service/impl/AlterationServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/AlterationServiceImpl.java index b14f090..f8bca32 100644 --- a/src/main/java/com/ydool/staff/service/impl/AlterationServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/AlterationServiceImpl.java @@ -1,17 +1,13 @@ package com.ydool.staff.service.impl; -import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.extra.spring.SpringUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ydool.common.base.BaseService; +import com.ydool.common.constant.ArgsConst; import com.ydool.common.data.dto.AjaxResult; import com.ydool.staff.dto.AlterationDto; -import com.ydool.staff.dto.PersonnelDto; import com.ydool.staff.entity.Alteration; -import com.ydool.staff.entity.Organization; -import com.ydool.staff.entity.Personnel; import com.ydool.staff.mapper.AlterationMapper; import com.ydool.staff.service.IAlterationService; import com.ydool.system.entity.Dept; @@ -21,10 +17,8 @@ import com.ydool.system.mapper.UserMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** *
@@ -41,8 +35,11 @@ public class AlterationServiceImpl extends BaseService