fix联锁编辑-查询

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

@@ -56,6 +56,7 @@ public class InterlockDetailEditQueryVO {
     @ApiModelProperty(value = "仪表状态（0正常1故障）")
     private java.lang.String instrumentStatus;
     private java.lang.String instrumentStatus_dictText;
+    private java.lang.String instrumentStatusNormalName;
     /**仪表状态判断方式（0直接读取位号1高低限判断2突变超限判断）*/
     @Excel(name = "仪表状态判断方式（0直接读取位号1高低限判断2突变超限判断）", width = 15, dicCode = "instrument_status_juge")
     @Dict(dicCode = "instrument_status_juge")
@@ -119,6 +120,7 @@ public class InterlockDetailEditQueryVO {
     @ApiModelProperty(value = "控制系统状态（	0正常1非正常）")
     private java.lang.String controlSystemStatus;
     private java.lang.String controlSystemStatus_dictText;
+    private java.lang.String controlSystemStatusNormalName;
     /**联锁设定值*/
     @Excel(name = "联锁设定值", width = 15)
     @ApiModelProperty(value = "联锁设定值")
@@ -134,6 +136,7 @@ public class InterlockDetailEditQueryVO {
     @ApiModelProperty(value = "旁路状态（0否1是）")
     private java.lang.String bypass;
     private java.lang.String bypass_dictText;
+    private java.lang.String bypassYesName;
     /**旁路状态-设备id*/
     @Excel(name = "旁路状态-设备id", width = 15)
     @ApiModelProperty(value = "旁路状态-设备id")
@@ -151,6 +154,7 @@ public class InterlockDetailEditQueryVO {
     @ApiModelProperty(value = "输入卡件状态")
     private java.lang.String inputStatus;
     private java.lang.String inputStatus_dictText;
+    private java.lang.String inputStatusNormalName;
     /**输入卡件状态-设备id*/
     @Excel(name = "输入卡件状态-设备id", width = 15)
     @ApiModelProperty(value = "输入卡件状态-设备id")
@@ -168,6 +172,7 @@ public class InterlockDetailEditQueryVO {
     @ApiModelProperty(value = "输出卡件状态")
     private java.lang.String outputStatus;
     private java.lang.String outputStatus_dictText;
+    private java.lang.String outputStatusNormalName;
     /**输出卡件状态-设备id*/
     @Excel(name = "输出卡件状态-设备id", width = 15)
     @ApiModelProperty(value = "输出卡件状态-设备id")
@@ -185,6 +190,7 @@ public class InterlockDetailEditQueryVO {
     @ApiModelProperty(value = "MP状态")
     private java.lang.String mpStatus;
     private java.lang.String mpStatus_dictText;
+    private java.lang.String mpStatusNormalName;
     /**MP状态-设备id*/
     @Excel(name = "MP状态-设备id", width = 15)
     @ApiModelProperty(value = "MP状态-设备id")

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/service/impl/InterlockSummaryServiceImpl.java

@@ -148,6 +148,7 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
                     vo.setBypass_dictText(base.getBypassYesName());
                 } else vo.setBypass_dictText(base.getBypassNoName());
             }
+            vo.setBypassYesName(base.getBypassYesName());
 
             //仪表状态
             if(base.getInstrumentStatusNormal()!=null ){
@@ -155,6 +156,8 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
                     vo.setInstrumentStatus_dictText(base.getInstrumentStatusNormalName());
                 }else vo.setInstrumentStatus_dictText(base.getInstrumentStatusAbnormalName());
             }
+            vo.setInstrumentStatusNormalName(base.getInstrumentStatusNormalName());
+
             //控制系统状态、输入卡件状态、输出卡件状态、MP状态
             if(base.getControlSystemStatusNormal()!=null){
                 if(base.getControlSystemStatusNormal().equals(i.getControlSystemStatus())) {
@@ -173,6 +176,10 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
                     vo.setMpStatus_dictText(base.getControlSystemStatusNormalName());
                 }else vo.setMpStatus_dictText(base.getControlSystemStatusAbnormalName());
             }
+            vo.setControlSystemStatusNormalName(base.getControlSystemStatusNormalName());
+            vo.setInputStatusNormalName(base.getControlSystemStatusNormalName());
+            vo.setOutputStatusNormalName(base.getControlSystemStatusNormalName());
+            vo.setMpStatusNormalName(base.getControlSystemStatusNormalName());
 
             return vo;
         }).collect(Collectors.toList());