Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspection/EditInspectionRequest.java

@@ -43,7 +43,7 @@ public class EditInspectionRequest {
     private Integer inspectionLine;
 
     /**
-     * 巡检任务类型: 1 临时巡检(目前只有该一种类型)
+     * 巡检任务类型: 0周期任务  1 单次任务
      */
     private Integer type;
 

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/resubmit/ResubmitInspectionService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.tuoheng.admin.conver.InspectionConverMapper;
 import com.tuoheng.admin.entity.*;
 import com.tuoheng.admin.enums.InspectionStatusEnum;
+import com.tuoheng.admin.enums.InspectionTaskTypeEnum;
 import com.tuoheng.admin.enums.InspectionTypeEnum;
 import com.tuoheng.admin.enums.MarkEnum;
 import com.tuoheng.admin.enums.code.inspection.ResubmitInspectionCodeEnum;
@@ -201,6 +202,7 @@ public class ResubmitInspectionService {
         String code = DateUtils.generateCode("GSDC");
         inspection.setCode(code);
         inspection.setId("");
+        inspection.setType(InspectionTaskTypeEnum.TEMPORARY_INSPECTION.getCode()); // 更改为“单次任务”类型
         inspection.setTenantId(tenantId);
         inspection.setDeptId(dept.getId());
         inspection.setCreateUser(user.getId());