Commit d1b757a558631d72539c8b51182910e933ff0c8f

Authored by 王富生
1 parent ad45012b

增加期望完成时间

urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanCommitSaveReqVO.java
@@ -36,6 +36,9 @@ public class AppInspectionPlanCommitSaveReqVO { @@ -36,6 +36,9 @@ public class AppInspectionPlanCommitSaveReqVO {
36 @NotNull(message = "转交状态: 1:未转交;2:已转交不能为空") 36 @NotNull(message = "转交状态: 1:未转交;2:已转交不能为空")
37 private Integer transState; 37 private Integer transState;
38 38
  39 + @Schema(description = "紧急程度" )
  40 + private Integer pressingType;
  41 +
39 @Schema(description = "转交问题单编码", requiredMode = Schema.RequiredMode.REQUIRED) 42 @Schema(description = "转交问题单编码", requiredMode = Schema.RequiredMode.REQUIRED)
40 private String transWorkNo; 43 private String transWorkNo;
41 44
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java
@@ -27,6 +27,7 @@ public interface AppGardenWorkOrderConvert { @@ -27,6 +27,7 @@ public interface AppGardenWorkOrderConvert {
27 orderReqVO.setSourceName("园林巡查上报"); 27 orderReqVO.setSourceName("园林巡查上报");
28 orderReqVO.setThirdWorkNo(planNo); 28 orderReqVO.setThirdWorkNo(planNo);
29 orderReqVO.setOrderType("C"); 29 orderReqVO.setOrderType("C");
  30 + orderReqVO.setPressingType(createReqVO.getPressingType());
30 orderReqVO.setFinishDate(LocalDateTime.now()); 31 orderReqVO.setFinishDate(LocalDateTime.now());
31 orderReqVO.setBusiLine(inspectionPlanDO.getBusiLine()); 32 orderReqVO.setBusiLine(inspectionPlanDO.getBusiLine());
32 orderReqVO.setLatLonType(3); 33 orderReqVO.setLatLonType(3);
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java
@@ -169,7 +169,7 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ @@ -169,7 +169,7 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
169 .inspectionState(createReqVO.getInspectionState()).transState(createReqVO.getTransState()) 169 .inspectionState(createReqVO.getInspectionState()).transState(createReqVO.getTransState())
170 .transWorkNo(createReqVO.getTransWorkNo()) 170 .transWorkNo(createReqVO.getTransWorkNo())
171 .userId(userId).userName(userName) 171 .userId(userId).userName(userName)
172 - .finishTime(now).creatorName(userName).updaterName(userName) 172 + .creatorName(userName).updaterName(userName)
173 .remark(createReqVO.getRemark()).imgHost(createReqVO.getImgHost()).build(); 173 .remark(createReqVO.getRemark()).imgHost(createReqVO.getImgHost()).build();
174 inspectionPlanCommit.setCreator(userId+""); 174 inspectionPlanCommit.setCreator(userId+"");
175 inspectionPlanCommit.setUpdater(userId+""); 175 inspectionPlanCommit.setUpdater(userId+"");