Browse Source

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

pull/380/head
suqin 8 months ago
parent
commit
cd95a43f6f
2 changed files with 3 additions and 1 deletions
  1. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspection/EditInspectionRequest.java
  2. +2
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/resubmit/ResubmitInspectionService.java

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspection/EditInspectionRequest.java View File

private Integer inspectionLine; private Integer inspectionLine;


/** /**
* 巡检任务类型: 1 临时巡检(目前只有该一种类型)
* 巡检任务类型: 0周期任务 1 单次任务
*/ */
private Integer type; private Integer type;



+ 2
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/resubmit/ResubmitInspectionService.java View File

import com.tuoheng.admin.conver.InspectionConverMapper; import com.tuoheng.admin.conver.InspectionConverMapper;
import com.tuoheng.admin.entity.*; import com.tuoheng.admin.entity.*;
import com.tuoheng.admin.enums.InspectionStatusEnum; import com.tuoheng.admin.enums.InspectionStatusEnum;
import com.tuoheng.admin.enums.InspectionTaskTypeEnum;
import com.tuoheng.admin.enums.InspectionTypeEnum; import com.tuoheng.admin.enums.InspectionTypeEnum;
import com.tuoheng.admin.enums.MarkEnum; import com.tuoheng.admin.enums.MarkEnum;
import com.tuoheng.admin.enums.code.inspection.ResubmitInspectionCodeEnum; import com.tuoheng.admin.enums.code.inspection.ResubmitInspectionCodeEnum;
String code = DateUtils.generateCode("GSDC"); String code = DateUtils.generateCode("GSDC");
inspection.setCode(code); inspection.setCode(code);
inspection.setId(""); inspection.setId("");
inspection.setType(InspectionTaskTypeEnum.TEMPORARY_INSPECTION.getCode()); // 更改为“单次任务”类型
inspection.setTenantId(tenantId); inspection.setTenantId(tenantId);
inspection.setDeptId(dept.getId()); inspection.setDeptId(dept.getId());
inspection.setCreateUser(user.getId()); inspection.setCreateUser(user.getId());

Loading…
Cancel
Save