fix

src/main/java/com/lz/modules/performance/controller/AssessManagerController.java

@@ -12,10 +12,13 @@ import com.lz.modules.performance.res.ChartStatistical;
 import com.lz.modules.performance.res.ChartStatisticalRes;
 import com.lz.modules.performance.service.AssessManagerService;
 import com.lz.modules.sys.dao.app.ResultRecordMapper;
+import com.lz.modules.sys.service.app.ResultRecordService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @Author: djc
  * @Desc:
@@ -32,6 +35,8 @@ public class AssessManagerController {
     private AssessManagerService assessManagerService;
     @Autowired
     private ResultRecordMapper resultRecordMapper;
+    @Autowired
+    private ResultRecordService resultRecordService;
 
 
     @PostMapping("assess/manager/list")
@@ -56,6 +61,7 @@ public class AssessManagerController {
     @PostMapping("assess/manager/chart")
     @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatistical.class)})
     public R assessChart(@RequestBody AssessDetailReq req){
+        List<ChartStatistical> process = resultRecordService.countNumByFlowProcess(startId);
         return R.ok();
 
     }

src/main/java/com/lz/modules/performance/req/AssessDetailReq.java

@@ -1,6 +1,8 @@
 package com.lz.modules.performance.req;
 
 import com.lz.modules.equipment.entity.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.models.auth.In;
 import lombok.Data;
 
@@ -12,17 +14,21 @@ import java.util.List;
  * @Date: 2020/10/13 18:00
  */
 @Data
+@ApiModel("获取考核详情实体")
 public class AssessDetailReq extends BasePage{
     //考勤组id
-    private Long evaluationId;
+    @ApiModelProperty(value = "考勤组ids",name = "evaluationIds")
+    private List<Long> evaluationIds;
     //发起考核的id
+    @ApiModelProperty(value = "发起考核的id",name = "startId")
     private int startId;
     //员工名称
+    @ApiModelProperty(value = "员工名称",name = "staffName")
     private String staffName;
-    //部门ids数组
-    private List<Long> departments;
     //人员id数组
+    @ApiModelProperty(value = "人员id数组",name = "staffIds")
     private List<Long> staffIds;
     //状态 确认 执行 结果录入。。。
+    @ApiModelProperty(value = "状态 确认 执行 结果录入。。。",name = "flowProcess")
     private Integer flowProcess;
 }

src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java

@@ -74,7 +74,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
     @Override
     public PageUtils assessDetail(AssessDetailReq req) {
         PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
-                page ->  resultRecordMapper.selectAssessListByStartId(page,null)
+                page ->  resultRecordMapper.selectAssessListByStartId(page,req)
         );
         return pageUtils;
     }

src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java

@@ -16,6 +16,7 @@ import com.lz.modules.app.req.ReportListReq;
 import com.lz.modules.app.req.ResultRecordReq;
 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.res.AssessManagerDetailRes;
 import com.lz.modules.performance.res.ChartStatistical;
 import com.lz.modules.sys.entity.app.ResultRecord;
@@ -84,5 +85,5 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
 
     ResultRecord selectOneByStartId(@Param("startId")Long startId);
 
-    List<AssessManagerDetailRes> selectAssessListByStartId(@Param("page") IPage page, @Param("startId")Long startId);
+    List<AssessManagerDetailRes> selectAssessListByStartId(@Param("page") IPage page, @Param("req")AssessDetailReq req);
 }

src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java

@@ -111,4 +111,6 @@ public interface ResultRecordService extends IService<ResultRecord> {
     R initFlowRecord(Long resultRecordId);
 
     R newApproval(ApprovalDto approvalDto);
+
+	List<ChartStatistical> countNumByFlowProcess(AssessDetailReq req);
 }

src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java

@@ -930,4 +930,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
        }
        return new Flow();
     }
+
+    @Override
+    public List<ChartStatistical> countNumByFlowProcess(AssessDetailReq req) {
+        return null;
+    }
 }

src/main/resources/mapper/app/ResultRecordMapper.xml

@@ -388,15 +388,22 @@
         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}
-        <if test="evaluationId !=null">
-            and r.evaluation_id = #{evaluationId}
+        <if test="req.evaluationIds !=null and req.evaluationIds.size()!=0">
+            and r.evaluation_id in(
+            <foreach collection="req.evaluationIds" item="evaluation_id" separator=",">
+                #{evaluation_id}
+            </foreach>
+            )
         </if>
-        <if test="flowProcess !=null">
-            and r.flow_process = #{flowProcess}
+        <if test="req.flowProcess !=null">
+            and r.flow_process = #{req.flowProcess}
         </if>
-        <if test="staffIds !=null and staffIds.size() !=0">
+        <if test="req.staffName !=null and req.staffName!=''">
+            and r.staff_name = #{req.staffName}
+        </if>
+        <if test="req.staffIds !=null and req.staffIds.size() !=0">
             and staff_id in(
-            <foreach collection="staffIds" item="staff_id" separator=",">
+            <foreach collection="req.staffIds" item="staff_id" separator=",">
                 #{staff_id}
             </foreach>
             )