大屏业务bug修复,系统预警信息待完善

This commit is contained in:
lhx
2025-11-13 18:26:29 +08:00
parent c6bc11e9b8
commit 47a6217329
10 changed files with 1522 additions and 17 deletions

View File

@@ -19,6 +19,7 @@
AND se.is_deleted = 0
</where>
ORDER BY se.valid_until ASC
Limit #{page.offset}, #{page.size}
</select>
<select id="getCheckExpiringCount" resultType="com.dc.dc_project.model.vo.bigScreen.SystemWarningItemVo">
SELECT se.id, se.name, se.valid_until AS date, DATEDIFF(se.valid_until, #{nowStr}) AS day FROM sys_equipment se

View File

@@ -17,7 +17,9 @@
<select id="getList" resultType="com.dc.dc_project.model.pojo.Laboratory">
select sl.* from sys_laboratory sl
left join sys_org_laboratory_standard sols on sl.id = sols.laboratory_id
<if test="standardId != null">
LEFT JOIN sys_org_laboratory_standard sols ON sl.id = sols.laboratory_id
</if>
<where>
<if test="name != null">
and sl.name like concat('%',#{name},'%')

View File

@@ -11,7 +11,7 @@
created_at,updated_at,is_deleted
</sql>
<select id="getCountByTime" resultType="java.lang.Long">
select count(*) from sys_record_entrust where entrust_date between #{startTime} and #{endTime}
select count(*) from sys_record_entrust where entrust_date between #{startTimeStr} and #{endTime}
</select>
<select id="getCountByTimeGroupE" resultType="com.dc.dc_project.model.vo.bigScreen.RecordStatisticsVo">
SELECT
@@ -24,10 +24,11 @@
LEFT JOIN sys_record_entrust e ON p.id = e.engineering_id
LEFT JOIN sys_record_report r ON e.id = r.entrust_id
<where>
e.create_time &gt;= #{startTimeStr}
AND e.create_time &lt;= #{endTimeStr}
e.created_at &gt;= #{startTimeStr}
AND e.created_at &lt;= #{endTimeStr}
</where>
GROUP BY p.id, p.engineering_name
ORDER BY entrust_count DESC;
Limit #{page.offset}, #{page.size}
</select>
</mapper>