联锁查询返回参数添加装置系统名称

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

@@ -109,7 +109,7 @@
         h1.interlock_status_name , h2.bypass_name ,
         h3.instrument_status_name , h4.control_system_status_name,
         h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal,
-        qxnr.limit_type
+        qxnr.limit_type, h.interlock_name as interlock_system_name, h5.interlock_name as interlock_apparatus_name
         from interlock_detail d
         left join interlock_summary s on d.summaryid = s.id
         left join interlock_base_hy h1 on h1.interlock_status = s.interlock_status and h1.interlock_system_id = s.interlock_system_id
@@ -117,6 +117,7 @@
         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
         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>

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/vo/InterlockSummaryLimitVO.java

@@ -74,11 +74,23 @@ public class InterlockSummaryLimitVO {
     /**装置id*/
     @Excel(name = "装置id", width = 15)
     @ApiModelProperty(value = "装置id")
+//    @Dict(dictTable = "interlock_base",dicCode = "id",dicText = "interlock_name")
     private java.lang.String interlockApparatusId;
     /**系统id*/
     @Excel(name = "系统id", width = 15)
     @ApiModelProperty(value = "系统id")
+//    @Dict(dictTable = "interlock_base",dicCode = "id",dicText = "interlock_name")
     private java.lang.String interlockSystemId;
+    /**系统名称*/
+    @Excel(name = "系统名称", width = 15)
+    @ApiModelProperty(value = "系统名称")
+//    @Dict(dictTable = "interlock_base",dicCode = "id",dicText = "interlock_name")
+    private java.lang.String interlockSystemName;
+    /**装置名称*/
+    @Excel(name = "装置名称", width = 15)
+    @ApiModelProperty(value = "装置名称")
+//    @Dict(dictTable = "interlock_base",dicCode = "id",dicText = "interlock_name")
+    private java.lang.String interlockApparatusName;
     /**系统权限类型（0管理1查看）*/
 //    @Excel(name = "系统权限类型（0管理1查看）", width = 15)
     @ApiModelProperty(value = "系统权限类型（0管理1查看）")