From cfe61f1a5850a15d769b43c049b49b10ae9974fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Wed, 28 Oct 2020 17:48:24 +0800
Subject: [PATCH 1/2] fix

---
 .../flow/dao/EvaluationStartStaffMapper.java  |  3 +++
 .../modules/flow/entity/EvaluationGroup.java  |  4 ++++
 .../service/EvaluationStartStaffService.java  |  2 ++
 .../impl/EvaluationGroupServiceImpl.java      |  8 +++++++
 .../impl/EvaluationStartStaffServiceImpl.java |  5 +++++
 .../performance/req/AssessToScoreReq.java     | 21 +++++++++++++++++++
 .../service/AssessManagerService.java         |  3 +++
 .../impl/AssessManagerServiceImpl.java        | 21 ++++++++++++++++++-
 .../flow/EvaluationStartStaffMapper.xml       |  4 ++++
 9 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/lz/modules/performance/req/AssessToScoreReq.java

diff --git a/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java b/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java
index aa8107fd..11b182e2 100644
--- a/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java
+++ b/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java
@@ -38,4 +38,7 @@ public interface EvaluationStartStaffMapper extends BaseMapper<EvaluationStartSt
 	EvaluationStartStaff selectOneByStartIdAndStaffId(@Param("startId")Long startId,@Param("staffId")Long staffId);
 
     EvaluationStartStaff selectManagerEvaluationStartStaff(@Param("evaluationId") Long evaluationId, @Param("staffId") Long userId);
+
+	int existByStartIdAndEvaluationId(@Param("startId") Long startId,@Param("evaluationId")Long evaluationId);
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/entity/EvaluationGroup.java b/src/main/java/com/lz/modules/flow/entity/EvaluationGroup.java
index 6660f0d8..2e1803ed 100644
--- a/src/main/java/com/lz/modules/flow/entity/EvaluationGroup.java
+++ b/src/main/java/com/lz/modules/flow/entity/EvaluationGroup.java
@@ -56,6 +56,10 @@ public class EvaluationGroup implements java.io.Serializable {
     @ApiModelProperty(value = "参与考核人数", name = "counts")
     private int counts;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "是否评分 0 :未通知 1：已通知", name = "score")
+    private int score;
+
     /**
      *  
      * @return
diff --git a/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java b/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java
index 73e5fb67..e131eba6 100644
--- a/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java
+++ b/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java
@@ -37,4 +37,6 @@ public interface EvaluationStartStaffService extends IService<EvaluationStartSta
 	EvaluationStartStaff selectOneByStartIdAndStaffId(Long startId,Long staffId);
 
     EvaluationStartStaff selectManagerEvaluationStartStaff(Long evaluationId, Long userId);
+
+    int existByStartIdAndEvaluationId(Long startId,Long evaluationId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
index 3193b78a..790fc6c0 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
@@ -12,6 +12,7 @@ import com.lz.modules.app.service.DepartmentsService;
 import com.lz.modules.app.service.StaffOccupationService;
 import com.lz.modules.app.service.StaffService;
 import com.lz.modules.flow.dao.EvaluationGroupMapper;
+import com.lz.modules.flow.dao.EvaluationStartStaffMapper;
 import com.lz.modules.flow.entity.EvaluationGroup;
 import com.lz.modules.flow.entity.FlowStart;
 import com.lz.modules.flow.req.EvaluationGroupReq;
@@ -55,6 +56,9 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
     @Autowired
 	private FlowStartService flowStartService;
 
+    @Autowired
+	private EvaluationStartStaffMapper evaluationStartStaffMapper;
+
 
 
 	@Override
@@ -117,6 +121,10 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 			 ) {
 			List<String> ids = evaluationGroupService.selectAllStaffIdsByGroupId(group.getId());
 			group.setCounts(ids.size());
+			int i = evaluationStartStaffMapper.existByStartIdAndEvaluationId(req.getStartId(),group.getId());
+			if(i>0){
+				group.setScore(1);
+			}
 		}
 		return pageUtils;
 	}
diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationStartStaffServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationStartStaffServiceImpl.java
index a0b42fc4..b58ac946 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationStartStaffServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationStartStaffServiceImpl.java
@@ -98,4 +98,9 @@ public class EvaluationStartStaffServiceImpl extends ServiceImpl<EvaluationStart
 	public EvaluationStartStaff selectManagerEvaluationStartStaff(Long evaluationId, Long userId){
 		return evaluationStartStaffMapper.selectManagerEvaluationStartStaff(evaluationId,userId);
 	}
+
+	@Override
+	public int existByStartIdAndEvaluationId(Long startId, Long evaluationId) {
+		return evaluationStartStaffMapper.existByStartIdAndEvaluationId(startId, evaluationId);
+	}
 }
diff --git a/src/main/java/com/lz/modules/performance/req/AssessToScoreReq.java b/src/main/java/com/lz/modules/performance/req/AssessToScoreReq.java
new file mode 100644
index 00000000..d51d1960
--- /dev/null
+++ b/src/main/java/com/lz/modules/performance/req/AssessToScoreReq.java
@@ -0,0 +1,21 @@
+package com.lz.modules.performance.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: djc
+ * @Desc:
+ * @Date: 2020/10/28 17:22
+ */
+@Data
+@ApiModel("开始评分")
+public class AssessToScoreReq {
+
+    @ApiModelProperty(value = "考核组ids",name = "evaluationIds")
+    private String evaluationIds;
+
+    @ApiModelProperty(value = "考核id",name = "startId")
+    private Long startId;
+}
diff --git a/src/main/java/com/lz/modules/performance/service/AssessManagerService.java b/src/main/java/com/lz/modules/performance/service/AssessManagerService.java
index c7d7d06f..94c9b0bf 100644
--- a/src/main/java/com/lz/modules/performance/service/AssessManagerService.java
+++ b/src/main/java/com/lz/modules/performance/service/AssessManagerService.java
@@ -5,6 +5,7 @@ import com.lz.modules.flow.entity.FlowStart;
 import com.lz.modules.performance.req.AssessChangeReq;
 import com.lz.modules.performance.req.AssessDetailReq;
 import com.lz.modules.performance.req.AssessListReq;
+import com.lz.modules.performance.req.AssessToScoreReq;
 
 /**
  * @Author: djc
@@ -20,4 +21,6 @@ public interface AssessManagerService {
     void accessDelete(FlowStart flowStart);
 
     String assessChange(AssessChangeReq req);
+
+    void toScore(AssessToScoreReq req);
 }
diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
index 8dcdfc66..5b23828c 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
@@ -13,6 +13,7 @@ import com.lz.modules.flow.service.EvaluationStartStaffService;
 import com.lz.modules.performance.req.AssessChangeReq;
 import com.lz.modules.performance.req.AssessDetailReq;
 import com.lz.modules.performance.req.AssessListReq;
+import com.lz.modules.performance.req.AssessToScoreReq;
 import com.lz.modules.performance.res.AssessManagerDetailRes;
 import com.lz.modules.performance.res.AssessManagerListRes;
 import com.lz.modules.performance.service.AssessManagerService;
@@ -111,17 +112,19 @@ public class AssessManagerServiceImpl implements AssessManagerService {
         if(flowStart == null){
             return "暂无此考核组信息";
         }
+        //获取本次考的所有考评组信息
         String[] split = flowStart.getGroupIds().split(",");
-        String[] changeStaffIds = req.getStaffIds().split(",");
         List<String> strings = Arrays.asList(split);
         List<Long> ids = strings.stream().map(s -> Long.valueOf(s)).collect(toList());
         List<EvaluationGroup> evaluationGroups = evaluationGroupService.selectEvaluationGroupByIds(ids);
         Set<String> staffIds = new HashSet<>();
+        //获取所有考核人员
         for(EvaluationGroup group:evaluationGroups){
             List<String> staff = evaluationGroupService.selectAllStaffIdsByGroupId(group.getId());
             staffIds.addAll(staff);
         }
         List<String> all = new ArrayList<>(staffIds);
+        String[] changeStaffIds = req.getStaffIds().split(",");
         List<String> change = Arrays.asList(changeStaffIds);
         if(req.getChangeType() == 0){
             //获取不在考评组的人员
@@ -142,10 +145,26 @@ public class AssessManagerServiceImpl implements AssessManagerService {
 
         }
         if(req.getChangeType() == 1){
+            //删除本次考核任务
             resultRecordMapper.batchDeleteByStartIdAndStaffId(req.getStartId(),change);
             return ok;
         }
         return ok;
 
+    }
+
+
+    @Override
+    public void toScore(AssessToScoreReq req) {
+        String[] split = req.getEvaluationIds().split(",");
+        for(String s:split){
+            int i = evaluationStartStaffService.existByStartIdAndEvaluationId(req.getStartId(), Long.valueOf(s));
+            if(i<1){
+
+            }
+        }
+
+
+
     }
 }
diff --git a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml
index fd93ca1a..90d82fc7 100644
--- a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml
+++ b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml
@@ -126,5 +126,9 @@
         AND staff_id =#{staffId} and type = 1 is_delete = 0 and limit 1
     </select>
 
+    <select id="existByStartIdAndEvaluationId" resultType="Integer">
+        select count(1) from lz_evaluation_start_staff  where is_delete = 0 and evaluation_id=#{evaluationId}
+        AND staff_id =#{staffId} and score = 1  limit 1
+    </select>
 </mapper>
 

From 72c50b62728fee045448673d422d8faea31ce9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Wed, 28 Oct 2020 18:02:53 +0800
Subject: [PATCH 2/2] fix

---
 .../flow/service/impl/EvaluationGroupServiceImpl.java    | 9 ++++++---
 .../resources/mapper/flow/EvaluationStartStaffMapper.xml | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
index 790fc6c0..9605a51d 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
@@ -121,9 +121,12 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 			 ) {
 			List<String> ids = evaluationGroupService.selectAllStaffIdsByGroupId(group.getId());
 			group.setCounts(ids.size());
-			int i = evaluationStartStaffMapper.existByStartIdAndEvaluationId(req.getStartId(),group.getId());
-			if(i>0){
-				group.setScore(1);
+			//是否通知评分
+			if(req.getStartId()!=null){
+				int i = evaluationStartStaffMapper.existByStartIdAndEvaluationId(req.getStartId(),group.getId());
+				if(i>0){
+					group.setScore(1);
+				}
 			}
 		}
 		return pageUtils;
diff --git a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml
index 90d82fc7..df4785b1 100644
--- a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml
+++ b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml
@@ -128,7 +128,7 @@
 
     <select id="existByStartIdAndEvaluationId" resultType="Integer">
         select count(1) from lz_evaluation_start_staff  where is_delete = 0 and evaluation_id=#{evaluationId}
-        AND staff_id =#{staffId} and score = 1  limit 1
+        AND start_id =#{startId} and score = 1  limit 1
     </select>
 </mapper>