巡检记录添加是否存在隐患字段、反馈弹框关掉重新打开图片还存在的问题

gassafety-system/src/main/java/com/zehong/system/domain/TInspectionData.java

@@ -34,6 +34,10 @@ public class TInspectionData extends BaseEntity
     @Excel(name = "处理状态", readConverterExp = "1=不需处理，2已处理完成，3未处理完成")
     private String dealStatus;
 
+    /** 是否存在隐患 */
+    @Excel(name = "是否存在隐患")
+    private String isHiddenDanger;
+
     /** 备注 */
     @Excel(name = "备注")
     private String remarks;
@@ -47,6 +51,7 @@ public class TInspectionData extends BaseEntity
     {
         return dataId;
     }
+
     public void setPlanId(int planId)
     {
         this.planId = planId;
@@ -56,6 +61,7 @@ public class TInspectionData extends BaseEntity
     {
         return planId;
     }
+
     public void setDeviceCode(String deviceCode)
     {
         this.deviceCode = deviceCode;
@@ -83,7 +89,16 @@ public class TInspectionData extends BaseEntity
     {
         return dealStatus;
     }
-    public void setRemarks(String remarks) 
+
+    public String getIsHiddenDanger() {
+        return isHiddenDanger;
+    }
+
+    public void setIsHiddenDanger(String isHiddenDanger) {
+        this.isHiddenDanger = isHiddenDanger;
+    }
+
+    public void setRemarks(String remarks)
     {
         this.remarks = remarks;
     }
@@ -101,6 +116,7 @@ public class TInspectionData extends BaseEntity
             .append("deviceCode", getDeviceCode())
             .append("deviceType", getDeviceType())
             .append("dealStatus", getDealStatus())
+            .append("isHiddenDanger", getIsHiddenDanger())
             .append("updateTime", getUpdateTime())
             .append("createTime", getCreateTime())
             .append("remarks", getRemarks())

gassafety-system/src/main/java/com/zehong/system/service/impl/TOrderFeedbackServiceImpl.java

@@ -69,6 +69,7 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
 
         String deviceCode = tOrderFeedback.getDeviceCode();
         String dealStatus = tOrderFeedback.getDealStatus();
+        String isHiddenDanger = tOrderFeedback.getIsHiddenDanger();
 
         // 根据工单类型和源id修改源数据状态
         TWorkOrder order = tWorkOrderMapper.selectTWorkOrderById(tOrderFeedback.getOrderId());
@@ -77,16 +78,20 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
         if("1".equals(orderType)){
             TInspectionData data = tInspectionDataMapper.selectTInspectionDataByCode(deviceCode);
             data.setDealStatus(dealStatus);
+            data.setIsHiddenDanger(isHiddenDanger);
+            data.setUpdateTime(DateUtils.getNowDate());
             tInspectionDataMapper.updateTInspectionData(data);
 
         } else if("2".equals(orderType)) {
             THiddenTrouble trouble = tHiddenTroubleMapper.selectTHiddenTroubleById(order.getResourceId());
             trouble.setDealStatus(dealStatus);
+            trouble.setUpdateTime(DateUtils.getNowDate());
             tHiddenTroubleMapper.updateTHiddenTrouble(trouble);
 
         } else if("3".equals(orderType)) {
             TDeviceAlarm alarm = tDeviceAlarmMapper.selectTDeviceAlarmById(order.getResourceId());
             alarm.setDealStatus(dealStatus);
+            alarm.setUpdateTime(DateUtils.getNowDate());
             tDeviceAlarmMapper.updateTDeviceAlarm(alarm);
         }
 

gassafety-system/src/main/resources/mapper/system/TInspectionDataMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="planId"    column="plan_id"    />
         <result property="deviceCode"    column="device_code"    />
         <result property="deviceType"    column="device_type"    />
+        <result property="isHiddenDanger"    column="is_hidden_danger"    />
         <result property="dealStatus"    column="deal_status"    />
         <result property="updateTime"    column="update_time"    />
         <result property="createTime"    column="create_time"    />
@@ -16,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTInspectionDataVo">
-        select data_id, plan_id, device_code, device_type, deal_status, update_time, create_time, remarks from t_inspection_data
+        select data_id, plan_id, device_code, device_type, is_hidden_danger, deal_status, update_time, create_time, remarks from t_inspection_data
     </sql>
 
     <select id="selectTInspectionDataList" parameterType="TInspectionData" resultMap="TInspectionDataResult">
@@ -26,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceCode != null "> and device_code = #{deviceCode}</if>
             <if test="deviceType != null "> and device_type = #{deviceType}</if>
             <if test="dealStatus != null  and dealStatus != ''"> and deal_status = #{dealStatus}</if>
+            <if test="isHiddenDanger != null  and isHiddenDanger != ''"> and is_hidden_danger = #{isHiddenDanger}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
         </where>
     </select>
@@ -53,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planId != null">plan_id,</if>
             <if test="deviceCode != null">device_code,</if>
             <if test="deviceType != null">device_type,</if>
+            <if test="isHiddenDanger != null">is_hidden_danger,</if>
             <if test="dealStatus != null">deal_status,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="createTime != null">create_time,</if>
@@ -63,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planId != null">#{planId},</if>
             <if test="deviceCode != null">#{deviceCode},</if>
             <if test="deviceType != null">#{deviceType},</if>
+            <if test="isHiddenDanger != null">#{isHiddenDanger},</if>
             <if test="dealStatus != null">#{dealStatus},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -76,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planId != null">plan_id = #{planId},</if>
             <if test="deviceCode != null">device_code = #{deviceCode},</if>
             <if test="deviceType != null">device_type = #{deviceType},</if>
+            <if test="isHiddenDanger != null">is_hidden_danger = #{isHiddenDanger},</if>
             <if test="dealStatus != null">deal_status = #{dealStatus},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

gassafety-web/src/views/workOrder/feedback/index.vue

@@ -122,7 +122,7 @@
     />
 
     <!-- 工单反馈对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="工单名称" prop="orderName">
           <font>{{form.orderName}}</font>