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 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">