mozhe
/
mental-health-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

团体报告bug修复；预警/干预列表添加搜索条件、干预次数

This commit is contained in:
cjw 2024-06-12 14:06:58 +08:00
parent 913ca4bead
commit 8c68beb85a
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java
View File

@ -11,7 +11,6 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* 预警记录视图对象 sys_warn_record * 预警记录视图对象 sys_warn_record
* *
@ -70,5 +69,10 @@ public class SysWarnRecordVo implements Serializable {
*/ */
private Integer interveneStatus; private Integer interveneStatus;
/**
* 干预次数
*/
private Integer interveneNum;
} }

2
ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml
View File

@ -90,7 +90,7 @@
from (select u.sex from (select u.sex
from sys_evaluation_record er from sys_evaluation_record er
left join sys_user u on u.user_id = er.user_id 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 group by er.user_id) t
</select> </select>

7
ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml
View File

@ -4,11 +4,12 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.scale.mapper.SysWarnRecordMapper"> <mapper namespace="org.dromara.scale.mapper.SysWarnRecordMapper">
<select id="selectPageWarnList" resultType="org.dromara.scale.domain.vo.SysWarnRecordVo"> <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 from sys_warn_record wr
left join sys_scale_publish sp on sp.batch_no = wr.batch_no 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_user u on u.user_id = wr.user_id
left join sys_dept d on d.dept_id = u.dept_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> <where>
<if test="et.nickName != null and et.nickName != ''"> <if test="et.nickName != null and et.nickName != ''">
u.nick_name like CONCAT('%', #{et.nickName}, '%') u.nick_name like CONCAT('%', #{et.nickName}, '%')
@ -25,7 +26,11 @@
<if test="et.endTime != null and et.endTime != ''"> <if test="et.endTime != null and et.endTime != ''">
and DATE_FORMAT(wr.warn_time, '%Y-%m-%d') &lt;= #{et.endTime} and DATE_FORMAT(wr.warn_time, '%Y-%m-%d') &lt;= #{et.endTime}
</if> </if>
<if test="et.batchNo != null">
and wr.batch_no = #{et.batchNo}
</if>
</where> </where>
group by wr.warn_id
order by wr.warn_time desc order by wr.warn_time desc
</select> </select>