Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/Inspection.java

@@ -276,6 +276,11 @@ public class Inspection extends BaseEntity {
      */
     private String patrolLocation;
 
+    /**
+     * 任务类型：0巡检任务 1应急任务
+     */
+    private Integer accidentTask;
+
     /**
      * 应急任务关联数据任务ID
      */

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/PointFlightService.java

@@ -126,7 +126,7 @@ public class PointFlightService {
         inspection.setCode(code);
         inspection.setDeptId(user.getDeptId());
         inspection.setName("应急任务"+code);
-        inspection.setType(2);
+        inspection.setType(1);
         inspection.setStatus(TaskStatusEnum.INFLIGHT.getCode());
         inspection.setRoadId("");
         inspection.setSectionId("");
@@ -138,6 +138,7 @@ public class PointFlightService {
         inspection.setExecutionStartTime(DateUtils.now());
         inspection.setCreateUser(user.getId());
         inspection.setCreateTime(DateUtils.now());
+        inspection.setAccidentTask(1);
         int result = inspectionMapper.insert(inspection);
         if(result<=0){
             log.info("创建应急任务失败");