联锁详细表和历史数据详细表查询list2添加单位参数

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/mapper/xml/InterlockDetailMapper.xml

@@ -12,7 +12,7 @@
         h3.control_system_status_name as output_status_name,
         h4.bypass_name,
         h5.instrument_status_name,
-        h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal
+        h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal, d.interlock_current_unit, d.interlock_set_unit
         from interlock_detail d
         left join interlock_summary s on d.summaryid = s.id
         left join interlock_base_hy h1 on h1.control_system_status = d.mp_status and h1.interlock_system_id = s.interlock_system_id

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/vo/InterlockDetailQueryVO.java

@@ -100,4 +100,9 @@ public class InterlockDetailQueryVO {
 //    @Dict(dicCode = "instrument_status")
     private java.lang.String instrumentStatus;
     private java.lang.String instrumentStatusName;
+
+    /**联锁条件值单位或联锁当前值单位*/
+    private java.lang.String interlockCurrentUnit;
+    /**联锁设定值单位*/
+    private java.lang.String interlockSetUnit;
 }

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

@@ -12,7 +12,7 @@
                h3.control_system_status_name as output_status_name,
                h4.bypass_name,
                h5.instrument_status_name,
-        h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal
+        h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal, d.interlock_current_unit, d.interlock_set_unit
         from interlock_detail_history d
         left join interlock_summary_history s on d.summaryid = s.id
         left join interlock_base_hy h1 on h1.control_system_status = d.mp_status and h1.interlock_system_id = s.interlock_system_id