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

gassafety-admin/src/main/java/com/zehong/web/controller/workOrder/TOrderFeedbackController.java

 package com.zehong.web.controller.workOrder;
 
 import java.util.List;
+
+import com.zehong.common.utils.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -74,9 +76,16 @@ public class TOrderFeedbackController extends BaseController
     @PreAuthorize("@ss.hasPermi('workOrder:feedback:add')")
     @Log(title = "工单反馈信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TOrderFeedback tOrderFeedback)
+    public AjaxResult add(@RequestBody TOrderFeedback tOrderFeedback) throws Exception
     {
-        return toAjax(tOrderFeedbackService.insertTOrderFeedback(tOrderFeedback));
+        int result = 0;
+        try {
+            result = tOrderFeedbackService.insertTOrderFeedback(tOrderFeedback);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new Exception(StringUtils.format("工单反馈操作失败，数据有误"));
+        }
+        return toAjax(result);
     }
 
     /**

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

@@ -42,8 +42,8 @@ public class TInspectionPlan extends BaseEntity
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
-    /** 状态 */
-    @Excel(name = "状态")
+    /** 计划状态（0未下发，1已下发，2进行中，3已完成） */
+    @Excel(name = "计划状态（0未下发，1已下发，2进行中，3已完成）")
     private String planStatus;
 
     /** 计划描述 */

gassafety-system/src/main/java/com/zehong/system/service/ITOrderFeedbackService.java

@@ -33,7 +33,7 @@ public interface ITOrderFeedbackService
      * @param tOrderFeedback 工单反馈信息
      * @return 结果
      */
-    public int insertTOrderFeedback(TOrderFeedback tOrderFeedback);
+    public int insertTOrderFeedback(TOrderFeedback tOrderFeedback) throws Exception;
 
     /**
      * 修改工单反馈信息

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

@@ -28,6 +28,10 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
     private THiddenTroubleMapper tHiddenTroubleMapper;
     @Autowired
     private TDeviceAlarmMapper tDeviceAlarmMapper;
+    @Autowired
+    private TPipeMapper tPipeMapper;
+    @Autowired
+    private TDeviceInfoMapper tDeviceInfoMapper;
 
     /**
      * 查询工单反馈信息
@@ -60,7 +64,7 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
      * @return 结果
      */
     @Override
-    public int insertTOrderFeedback(TOrderFeedback tOrderFeedback)
+    public int insertTOrderFeedback(TOrderFeedback tOrderFeedback) throws Exception
     {
         if("2".equals(tOrderFeedback.getIsHiddenDanger())){
             tOrderFeedback.setDealStatus("1");
@@ -82,6 +86,15 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
             data.setUpdateTime(DateUtils.getNowDate());
             tInspectionDataMapper.updateTInspectionData(data);
 
+            if("0".equals(data.getDeviceType())){
+                TPipe pipe = tPipeMapper.selectTPipeByCode(deviceCode);
+                pipe.setInspectionTime(DateUtils.getNowDate());
+                tPipeMapper.updateTPipe(pipe);
+            } else {
+                TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoByCode(deviceCode);
+                device.setInspectionTime(DateUtils.getNowDate());
+                tDeviceInfoMapper.updateTDeviceInfo(device);
+            }
         } else if("2".equals(orderType)) {
             THiddenTrouble trouble = tHiddenTroubleMapper.selectTHiddenTroubleById(order.getResourceId());
             trouble.setDealStatus(dealStatus);