From 4cb0e50a6649635ca3e0fbd4ae4de49e3c4f3c3f Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Tue, 21 May 2024 11:01:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=B7=BB=E5=8A=A0=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/scale/mapper/SysEvaluationRecordMapper.java   | 2 ++
 .../org/dromara/scale/mapper/SysScalePublishMapper.java   | 1 +
 .../org/dromara/scale/service/impl/WebServiceImpl.java    | 8 +++++++-
 .../resources/mapper/scale/SysEvaluationRecordMapper.xml  | 8 ++++++++
 .../main/resources/mapper/scale/SysScalePublishMapper.xml | 6 ++++++
 5 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java
index 9b889b9..1edd16e 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java
@@ -46,4 +46,6 @@ public interface SysEvaluationRecordMapper extends BaseMapperPlus<SysEvaluationR
     List<StatisticNumVo> selectFactorNum(@Param("batchNo") Long batchNo, @Param("scaleId") Long scaleId);
     List<StatisticNumVo> selectFactorWarnNum(@Param("batchNo") Long batchNo, @Param("scaleId") Long scaleId,@Param("list")List<Integer> warnList);
 
+    int selectUndoneNumByBatchNoAndUserId(@Param("batchNo") Long batchNo,@Param("userId") Long userId);
+
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java
index b0c197d..3652759 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java
@@ -37,4 +37,5 @@ public interface SysScalePublishMapper extends BaseMapperPlus<SysScalePublish, S
 
     int selectCountScalePublish();
 
+    void addCompleteNum(Long batchNo);
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java
index 1e98fbf..e82ad18 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java
@@ -151,6 +151,7 @@ public class WebServiceImpl implements IWebService {
         }
         SysScalePublishVo scalePublishVo = recordMapper.selectPublishByUseRecord(recordId);
         //查询考核结果
+        Long batchNo = scalePublishVo.getBatchNo();
         if (scalePublishVo.getAllowQueryResult() == 0) {
             allowQueryResult = false;
         }
@@ -167,6 +168,10 @@ public class WebServiceImpl implements IWebService {
         update.setUpdateTime(new Date());
         recordMapper.updateById(update);
 
+        int undoneNum = recordMapper.selectUndoneNumByBatchNoAndUserId(batchNo, loginUser.getUserId());
+        if (undoneNum <= 1) {
+            publishMapper.addCompleteNum(batchNo);
+        }
         Integer riskLevel = -1;
         //选择风险等级最高
         for (SysEvaluationConclusionVo ec : list) {
@@ -177,13 +182,14 @@ public class WebServiceImpl implements IWebService {
         List<Integer> used = warnMapper.selectUseConfig();
         if (used.contains(riskLevel)) {
             SysWarnRecord wre = new SysWarnRecord();
-            wre.setBatchNo(scalePublishVo.getBatchNo());
+            wre.setBatchNo(batchNo);
             wre.setUserId(loginUser.getUserId());
             wre.setDeptId(loginUser.getDeptId());
             wre.setWarnTime(new Date());
             wre.setSituation(riskLevel);
             warnRecordService.insertByBo(wre);
         }
+
         //不允许查看考核结果
         if (!allowQueryResult) {
             return null;
diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml
index 48f478c..a461ecd 100644
--- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml
+++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml
@@ -110,4 +110,12 @@
         where sf.scale_id = #{scaleId}
         group by sf.factor_id
     </select>
+
+    <select id="selectUndoneNumByBatchNoAndUserId" resultType="int">
+        select count(*)
+        from sys_evaluation_record
+        where batch_no = #{batchNo}
+        and user_id= #{userId}
+        and status &lt; 1
+    </select>
 </mapper>
diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml
index d0c7526..a45841e 100644
--- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml
+++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml
@@ -89,4 +89,10 @@
         select count(*)
         from sys_scale_publish
     </select>
+
+    <select id="addCompleteNum" >
+        update sys_scale_publish
+        set complete_num = complete_num + 1
+        where batch_no = #{batchNo}
+    </select>
 </mapper>