|
|
@@ -54,17 +54,15 @@
|
|
|
|
|
|
<select id="selectWarningNoticelist" parameterType="com.zd.laboratory.domain.vo.WarningNoticeLogVO"
|
|
|
resultType="com.zd.laboratory.domain.vo.WarningNoticeLogVO">
|
|
|
- select (select de.dept_name
|
|
|
- from lab_subject su
|
|
|
- LEFT JOIN sys_dept de on su.dept_id = de.dept_id
|
|
|
- where su.id = l.sub_id) deptName,
|
|
|
+ select college_name deptName,
|
|
|
dispose,
|
|
|
- count(l.id) totalNum
|
|
|
- from lab_warning_notice_log l
|
|
|
+ count(id) totalNum
|
|
|
+ from lab_warning_notice_log
|
|
|
where DATE_FORMAT(create_time, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m')
|
|
|
<if test="deptId != null and deptId !=''">
|
|
|
and ( college_id in (SELECT dt.dept_id FROM sys_dept dt WHERE find_in_set(#{deptId} ,ancestors )) or college_id = #{deptId} )
|
|
|
</if>
|
|
|
+ GROUP BY deptName, dispose
|
|
|
ORDER BY create_time desc
|
|
|
</select>
|
|
|
|