From 51d9cfbc5b4fa0fd18b9533ea3ee2aafaa1ff088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Thu, 22 Oct 2020 17:17:05 +0800
Subject: [PATCH] fix

---
 .../controller/AssessManagerController.java   | 28 +++++++++++--------
 .../sys/dao/app/ResultRecordMapper.java       |  3 +-
 .../mapper/app/ResultRecordMapper.xml         | 15 ++++++++++
 3 files changed, 34 insertions(+), 12 deletions(-)

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 a60fb274..9ac16041 100644
--- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
+++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
@@ -1,5 +1,6 @@
 package com.lz.modules.performance.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.R;
 import com.lz.modules.flow.dao.FlowStartMapper;
@@ -11,6 +12,8 @@ import com.lz.modules.performance.req.AssessDetailReq;
 import com.lz.modules.performance.res.AssessManagerDetailRes;
 import com.lz.modules.performance.res.AssessManagerListRes;
 import com.lz.modules.performance.res.ChartStatisticalRes;
+import com.lz.modules.sys.dao.app.ResultRecordMapper;
+import com.lz.modules.sys.entity.app.ResultRecord;
 import io.swagger.annotations.ApiImplicitParam;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,9 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.ToLongFunction;
@@ -40,6 +41,8 @@ public class AssessManagerController {
     private FlowStartMapper flowStartMapper;
     @Autowired
     private EvaluationGroupService evaluationGroupService;
+    @Autowired
+    private ResultRecordMapper resultRecordMapper;
 
 
     @RequestMapping("assess/manager/list")
@@ -54,13 +57,13 @@ public class AssessManagerController {
         }
         list.forEach(flowStart -> {
             AssessManagerListRes res = new AssessManagerListRes();
+            String name = flowStart.getName();
             res.setId(flowStart.getId());
-            res.setName(flowStart.getName());
-            if(flowStart.getCycleType()==0){
-
-            }else if(flowStart.getCycleType()==1){
-
+            res.setName(name);
+            if(name.contains("绩效考核")){
+                res.setCycleTime(name.substring(0,name.lastIndexOf("绩效考核")));
             }
+
             res.setJoinNum("");
             data.add(res);
         });
@@ -97,13 +100,16 @@ public class AssessManagerController {
         if(CollectionUtils.isEmpty(evaluationGroups)){
             return R.ok();
         }
+        Set<String> staffIds = new HashSet<>();
         evaluationGroups.stream().forEach(evaluationGroup -> {
             List<String> strings = evaluationGroupService.selectAllStaffIdsByGroupId(evaluationGroup.getId());
-            //删除考核任务
-
-
+            staffIds.addAll(strings);
         });
+        List<String> distStaffIds = new ArrayList<>(staffIds);
+        // 批量删除
+        resultRecordMapper.batchDeleteByStaffIdsAndMonth(distStaffIds,"","");
         return R.ok();
 
+
     }
 }
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 254e6e38..6bc57278 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
@@ -79,6 +79,7 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
 
     List<ResultRecord> selectResultRankList(@Param("page") IPage page, @Param("req") ChartResultReq req);
 
-    void
+    void batchDeleteByStaffIdsAndMonth(@Param("staffIds")List<String> staffIds,@Param("startTime")String startTime,@Param("endTime")String endTime);
 
+    int countStartAndGroupNum(@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 404796d0..5d58efd4 100644
--- a/src/main/resources/mapper/app/ResultRecordMapper.xml
+++ b/src/main/resources/mapper/app/ResultRecordMapper.xml
@@ -353,5 +353,20 @@
         where r.is_delete =0 and s.is_delete=0 ORDER BY all_score desc
     </select>
 
+
+    <update id="batchDeleteByStaffIdsAndMonth">
+        update lz_result_record set is_delete = 1 where
+        is_delete = 0
+        and month_time = #{}
+        staff_id in
+        <foreach collection="staffIds" item="staff_id" open="(" close=")"
+                 separator=",">
+            #{staff_id}
+        </foreach>
+    </update>
+
+    <select id="countStartAndGroupNum" resultType="int">
+        select COUNT(1) from lz_result_record  where is_delete = 0 and start_id = #{startId}
+    </select>
 </mapper>