From 8c68beb85ac20c76520adee710570112a520d7ac Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Wed, 12 Jun 2024 14:06:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E4=BD=93=E6=8A=A5=E5=91=8Abug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9B=E9=A2=84=E8=AD=A6/=E5=B9=B2?=
 =?UTF-8?q?=E9=A2=84=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E3=80=81=E5=B9=B2=E9=A2=84=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/scale/domain/vo/SysWarnRecordVo.java  | 6 +++++-
 .../main/resources/mapper/scale/SysScalePublishMapper.xml  | 2 +-
 .../main/resources/mapper/scale/SysWarnRecordMapper.xml    | 7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java
index baccec9..93743b1 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java
@@ -11,7 +11,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 
-
 /**
  * 预警记录视图对象 sys_warn_record
  *
@@ -70,5 +69,10 @@ public class SysWarnRecordVo implements Serializable {
      */
     private Integer interveneStatus;
 
+    /**
+     * 干预次数
+     */
+    private Integer interveneNum;
+
 
 }
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 f9b08cc..5bdca5c 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
@@ -90,7 +90,7 @@
         from (select u.sex
               from sys_evaluation_record er
                        left join sys_user u on u.user_id = er.user_id
-              where er.batch_no = 1793103701690454017
+              where er.batch_no = #{batchNo}
               group by er.user_id) t
     </select>
 
diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml
index 8ff7fd3..a0721a3 100644
--- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml
+++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml
@@ -4,11 +4,12 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.scale.mapper.SysWarnRecordMapper">
     <select id="selectPageWarnList" resultType="org.dromara.scale.domain.vo.SysWarnRecordVo">
-        select wr.*, sp.session_name, u.nick_name, u.intervene_status
+        select wr.*, sp.session_name, u.nick_name, u.intervene_status, count(ir.intervene_id) as `interveneNum`
         from sys_warn_record wr
                  left join sys_scale_publish sp on sp.batch_no = wr.batch_no
                  left join sys_user u on u.user_id = wr.user_id
                  left join sys_dept d on d.dept_id = u.dept_id
+                 left join sys_intervene_record ir on ir.batch_no = wr.batch_no and ir.user_id = wr.user_id
         <where>
             <if test="et.nickName != null and et.nickName != ''">
                 u.nick_name like CONCAT('%', #{et.nickName}, '%')
@@ -25,7 +26,11 @@
             <if test="et.endTime != null and et.endTime != ''">
                 and DATE_FORMAT(wr.warn_time, '%Y-%m-%d') &lt;= #{et.endTime}
             </if>
+            <if test="et.batchNo != null">
+                and wr.batch_no = #{et.batchNo}
+            </if>
         </where>
+        group by wr.warn_id
         order by wr.warn_time desc
     </select>