Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

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

@@ -71,7 +71,6 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
         }
         tOrderFeedback.setFeedbackTime(DateUtils.getNowDate());
 
-        Integer deviceId = tOrderFeedback.getDeviceId();
         String dealStatus = tOrderFeedback.getDealStatus();
         String isHiddenDanger = tOrderFeedback.getIsHiddenDanger();
 
@@ -80,6 +79,7 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
         String orderType = order.getOrderType();
 
         if("1".equals(orderType)){
+            Integer deviceId = tOrderFeedback.getDeviceId();
             TInspectionData data = tInspectionDataMapper.selectTInspectionDataByDeviceId(deviceId);
             data.setDealStatus(dealStatus);
             data.setIsHiddenDanger(isHiddenDanger);
@@ -103,18 +103,39 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
             trouble.setDealStatus(dealStatus);
             trouble.setUpdateTime(DateUtils.getNowDate());
 
+            tOrderFeedback.setDeviceId(trouble.getDeviceId());
             tOrderFeedback.setDeviceType(trouble.getDeviceType());
 
             tHiddenTroubleMapper.updateTHiddenTrouble(trouble);
 
+            if("0".equals(trouble.getDeviceType())){
+                TPipe pipe = tPipeMapper.selectTPipeById(trouble.getDeviceId());
+                pipe.setInspectionTime(DateUtils.getNowDate());
+                tPipeMapper.updateTPipe(pipe);
+            } else {
+                TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoById(trouble.getDeviceId());
+                device.setInspectionTime(DateUtils.getNowDate());
+                tDeviceInfoMapper.updateTDeviceInfo(device);
+            }
         } else if("3".equals(orderType)) {
             TDeviceAlarm alarm = tDeviceAlarmMapper.selectTDeviceAlarmById(order.getResourceId());
             alarm.setDealStatus(dealStatus);
             alarm.setUpdateTime(DateUtils.getNowDate());
 
+            tOrderFeedback.setDeviceId(alarm.getDeviceId());
             tOrderFeedback.setDeviceType(alarm.getDeviceType());
 
             tDeviceAlarmMapper.updateTDeviceAlarm(alarm);
+
+            if("0".equals(alarm.getDeviceType())){
+                TPipe pipe = tPipeMapper.selectTPipeById(alarm.getDeviceId());
+                pipe.setInspectionTime(DateUtils.getNowDate());
+                tPipeMapper.updateTPipe(pipe);
+            } else {
+                TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoById(alarm.getDeviceId());
+                device.setInspectionTime(DateUtils.getNowDate());
+                tDeviceInfoMapper.updateTDeviceInfo(device);
+            }
         }
 
         // 如果工单状态是已接收，修改状态为已反馈

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

@@ -133,7 +133,7 @@
 
     <!-- 归档或修改工单基础信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <div v-if="this.title == '工单信息修改'">
           <el-form-item label="工单名称" prop="orderName">
             <el-input v-model="form.orderName" placeholder="请输入工单名称" />
@@ -153,15 +153,15 @@
           </el-form-item>
         </div>
         <div v-if="this.title == '工单信息归档'">
-          <el-form-item label="工单名称" prop="orderName">
+          <el-form-item label="工单名称">
             <font>{{form.orderName}}</font>
           </el-form-item>
-          <el-form-item label="工单类型" prop="orderType">
+          <el-form-item label="工单类型">
             <span type="primary" v-if="form.orderType == 1">巡检信息</span>
             <span type="primary" v-if="form.orderType == 2">隐患信息</span>
             <span type="primary" v-if="form.orderType == 3">报警信息</span>
           </el-form-item>
-          <el-form-item label="工单编号" prop="orderId">
+          <el-form-item label="工单编号">
             <font>{{form.orderId}}</font>
           </el-form-item>
           <el-form-item label="归档信息" prop="archiving">
@@ -232,6 +232,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        orderName: [
+          { required: true, message: "请输入工单名称", trigger: "blur" }
+        ],
+        appointInspector: [
+          { required: true, message: "请选择执行人员", trigger: "blur" }
+        ],
       }
     };
   },

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

@@ -142,7 +142,7 @@
         <el-form-item label="工单编号" prop="orderId">
           <font>{{form.orderId}}</font>
         </el-form-item>
-        <el-form-item label="设备列表" prop="deviceCode" v-if="form.orderType == '1'">
+        <el-form-item label="设备列表" prop="deviceId" v-if="form.orderType == '1'">
           <el-select v-model="form.deviceId" placeholder="请选择设备" clearable size="small" filterable >
             <el-option
               v-for="device in form.deviceInfoList"
@@ -248,6 +248,9 @@
         form: {},
         // 表单校验
         rules: {
+          deviceId: [
+            { required: true, message: "请选择设备", trigger: "blur" }
+          ],
         }
       };
     },
@@ -300,7 +303,7 @@
       // 表单重置
       reset() {
         this.form = {
-          deviceCode: null,
+          deviceId: null,
           pictureUrl1: null,
           pictureUrl2: null,
           pictureUrl3: null,