diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java index 929a95c8..35028f44 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -43,6 +43,7 @@ public class AssessManagerController { } @PostMapping("assess/manager/detail") + @ApiOperation("获取考核详情列表") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerDetailRes.class)}) public R assessDetail(@RequestBody AssessDetailReq req){ PageUtils pageUtils = assessManagerService.assessDetail(req); diff --git a/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java b/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java index 054977b0..3653ec1b 100644 --- a/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java +++ b/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java @@ -1,6 +1,7 @@ package com.lz.modules.performance.req; import com.lz.modules.equipment.entity.model.BasePage; +import io.swagger.models.auth.In; import lombok.Data; import java.util.List; @@ -13,15 +14,9 @@ import java.util.List; @Data public class AssessDetailReq extends BasePage{ //考勤组id - private Long groupId; - - private String month; - - private String startTime; - - private String endTime; - //周期类型 - private int type; + private Long evaluationId; + //发起考核的id + private int startId; //员工名称 private String staffName; //部门ids数组 @@ -29,5 +24,5 @@ public class AssessDetailReq extends BasePage{ //人员id数组 private List staffIds; //状态 确认 执行 结果录入。。。 - private int status; + private Integer flowProcess; } diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java index d83f3e3c..dd49703e 100644 --- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java +++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java @@ -18,6 +18,7 @@ import com.lz.modules.app.resp.OwnResultResp; import com.lz.modules.flow.model.ResultRecordDto; import com.lz.modules.performance.req.AssessDetailReq; import com.lz.modules.performance.req.ChartResultReq; +import com.lz.modules.performance.res.AssessManagerDetailRes; import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.sys.entity.app.ResultRecord; import org.apache.ibatis.annotations.Mapper; @@ -85,5 +86,5 @@ public interface ResultRecordMapper extends BaseMapper { ResultRecord selectOneByStartId(@Param("startId")Long startId); - List selectAssessListByStartId(@Param("page") IPage page,@Param("startId")Long startId); + List selectAssessListByStartId(@Param("page") IPage page, @Param("startId")Long startId); } \ No newline at end of file diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index c66b9b39..50d4b090 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -388,6 +388,19 @@ ON r.start_id = s.start_id and r.staff_id = s.staff_id where r.is_delete = 0 and s.is_delete = 0 and r.start_id = #{startId} + + and r.evaluation_id = #{evaluationId} + + + and r.flow_process = #{flowProcess} + + + and staff_id in( + + #{staff_id} + + ) +