Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

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);

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 Long evaluationId;
-
+    //发起考核的id
-    private String month;
+    private int startId;
-
-    private String startTime;
-
-    private String endTime;
-    //周期类型
-    private int type;
     //员工名称
     private String staffName;
     //部门ids数组
@@ -29,5 +24,5 @@ public class AssessDetailReq extends BasePage{
     //人员id数组
     private List<Long> staffIds;
     //状态 确认 执行 结果录入。。。
-    private int status;
+    private Integer flowProcess;
 }

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> {
 
     ResultRecord selectOneByStartId(@Param("startId")Long startId);
 
-    List<ResultRecord> selectAssessListByStartId(@Param("page") IPage page,@Param("startId")Long startId);
+    List<AssessManagerDetailRes> selectAssessListByStartId(@Param("page") IPage page, @Param("startId")Long startId);
 }

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}
+        <if test="evaluationId !=null">
+            and r.evaluation_id = #{evaluationId}
+        </if>
+        <if test="flowProcess !=null">
+            and r.flow_process = #{flowProcess}
+        </if>
+        <if test="staffIds !=null and staffIds.size() !=0">
+            and staff_id in(
+            <foreach collection="staffIds" item="staff_id" separator=",">
+                #{staff_id}
+            </foreach>
+            )
+        </if>
     </select>
 
 </mapper>