Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改兼容其他设备的bug

Browse Source
This commit is contained in:
hzj
2025-09-18 10:03:56 +08:00
parent 0d1c142885
commit b908186758
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
View File

@@ -122,17 +122,15 @@
select DISTINCT b.id id, select DISTINCT b.id id,
b.device_id deviceId,b.line_id lineId,b.code code, b.device_id deviceId,b.line_id lineId,b.code code,
b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.level level,b.location location,b.cl_did clDid b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.level level,b.location location,b.cl_did clDid
<if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != 3 "> <if test="csEventUserQueryPage!=null and (csEventUserQueryPage.type == 0 or csEventUserQueryPage.type == 1 )">
,d.name lineName ,d.name lineName
</if> </if>
from cs_event b from cs_event b
<if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != 3 "> <if test="csEventUserQueryPage!=null and (csEventUserQueryPage.type == 0 or csEventUserQueryPage.type == 1 )">
inner join cs_equipment_delivery c on b.device_id=c.id inner join cs_line d on d.device_id=b.device_id and d.clDid=b.cl_did inner join cs_line d on d.line_id=b.line_id
</if> </if>
where 1=1 where 1=1
<if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != 3 ">
and b.process=c.process
</if>
<if test="csEventUserQueryPage!=null and csEventUserQueryPage.endTime != null and csEventUserQueryPage.endTime !=''"> <if test="csEventUserQueryPage!=null and csEventUserQueryPage.endTime != null and csEventUserQueryPage.endTime !=''">
AND DATE(b.start_time) &lt;= DATE(#{csEventUserQueryPage.endTime}) AND DATE(b.start_time) &lt;= DATE(#{csEventUserQueryPage.endTime})
</if> </if>