联锁详细表和历史详细表查询添加仪表状态的位号参数

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

@@ -14,7 +14,7 @@
         h5.instrument_status_name,
         h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal,
         d.interlock_current_unit, d.interlock_set_unit,
-        d.bypass_tag, d.input_status_tag, d.output_status_tag, d.mp_status_tag, s.interlock_out_value_tag
+        d.bypass_tag, d.input_status_tag, d.output_status_tag, d.mp_status_tag, s.interlock_out_value_tag, d.instrument_status_tag
         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

@@ -116,5 +116,7 @@ public class InterlockDetailQueryVO {
     private java.lang.String mpStatusTag;
     /**联锁输出值位号*/
     private java.lang.String interlockOutValueTag;
+    /**仪表状态位号*/
+    private java.lang.String instrumentStatusTag;
 
 }

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

@@ -14,7 +14,7 @@
                h5.instrument_status_name,
         h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal,
         d.interlock_current_unit, d.interlock_set_unit,
-        d.bypass_tag, d.input_status_tag, d.output_status_tag, d.mp_status_tag, s.interlock_out_value_tag
+        d.bypass_tag, d.input_status_tag, d.output_status_tag, d.mp_status_tag, s.interlock_out_value_tag, d.instrument_status_tag
         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

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/vo/InterlockDetailHistoryQueryVO.java

@@ -119,5 +119,7 @@ public class InterlockDetailHistoryQueryVO {
     private java.lang.String mpStatusTag;
     /**联锁输出值位号*/
     private java.lang.String interlockOutValueTag;
+    /**仪表状态位号*/
+    private java.lang.String instrumentStatusTag;
 
 }