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

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

@@ -100,13 +100,14 @@ public class TWorkOrderController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TWorkOrder tWorkOrder) throws Exception
     {
+        String orderId = null;
         try {
-            tWorkOrderService.insertTWorkOrder(tWorkOrder);
+            orderId = tWorkOrderService.insertTWorkOrder(tWorkOrder);
         } catch (Exception e) {
             e.printStackTrace();
             throw new Exception("新增工单信息失败");
         }
-        return AjaxResult.success();
+        return AjaxResult.success(orderId);
     }
 
     /**

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

@@ -36,7 +36,7 @@ public interface ITWorkOrderService
      * @param tWorkOrder 工单基础信息
      * @return 结果
      */
-    public int insertTWorkOrder(TWorkOrder tWorkOrder) throws Exception;
+    public String insertTWorkOrder(TWorkOrder tWorkOrder) throws Exception;
 
     /**
      * 修改工单基础信息

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

@@ -224,7 +224,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
      * @return 结果
      */
     @Override
-    public int insertTWorkOrder(TWorkOrder tWorkOrder) throws Exception
+    public String insertTWorkOrder(TWorkOrder tWorkOrder) throws Exception
     {
         String orderId = tWorkOrderMapper.getWorkOrderId();
         int resourceId = tWorkOrder.getResourceId();
@@ -256,7 +256,8 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
             tDeviceAlarmMapper.updateTDeviceAlarm(alarm);
         }
 
-        return tWorkOrderMapper.insertTWorkOrder(tWorkOrder);
+        tWorkOrderMapper.insertTWorkOrder(tWorkOrder);
+        return orderId;
     }
 
     /**