Browse Source

查询联锁历史数据优化:排除一些已删除的联锁历史数据

sl 1 week ago
parent
commit
44fe67649e

+ 4 - 4
jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/xml/InterlockDetailHistoryMapper.xml

@@ -175,8 +175,8 @@
         left join interlock_base_hy h2 on h2.bypass = d.bypass and h2.interlock_system_id = s.interlock_system_id
         left join interlock_base_hy h3 on h3.instrument_status = d.instrument_status and h3.interlock_system_id = s.interlock_system_id
         left join interlock_base_hy h4 on h4.control_system_status = d.control_system_status and h4.interlock_system_id = s.interlock_system_id
-        left join interlock_base h on h.id = s.interlock_system_id
-        left join interlock_base h5 on h5.id = s.interlock_apparatus_id
+        inner join interlock_base h on h.id = s.interlock_system_id
+        inner join interlock_base h5 on h5.id = s.interlock_apparatus_id
         left join (select l.* from interlock_system_limit l where l.interlock_user_id in
         (select u.id from interlock_user u where u.username=#{wiseUser})) qxnr on qxnr.interlock_system_id = s.interlock_system_id
         <where>
@@ -212,8 +212,8 @@
         left join interlock_base_hy h2 on h2.bypass = d.bypass and h2.interlock_system_id = s.interlock_system_id
         left join interlock_base_hy h3 on h3.instrument_status = d.instrument_status and h3.interlock_system_id = s.interlock_system_id
         left join interlock_base_hy h4 on h4.control_system_status = d.control_system_status and h4.interlock_system_id = s.interlock_system_id
-        left join interlock_base h on h.id = s.interlock_system_id
-        left join interlock_base h5 on h5.id = s.interlock_apparatus_id
+        inner join interlock_base h on h.id = s.interlock_system_id
+        inner join interlock_base h5 on h5.id = s.interlock_apparatus_id
         <where>
             <if test="dto.interlockSystemId != null and dto.interlockSystemId != ''"> and s.interlock_system_id =  #{dto.interlockSystemId}</if>
             <if test="dto.interlockApparatusId != null and dto.interlockApparatusId != ''"> and s.interlock_apparatus_id =  #{dto.interlockApparatusId}</if>