diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanCommitSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanCommitSaveReqVO.java index c19744e..1e4b3a0 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanCommitSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanCommitSaveReqVO.java @@ -36,6 +36,9 @@ public class AppInspectionPlanCommitSaveReqVO { @NotNull(message = "转交状态: 1:未转交;2:已转交不能为空") private Integer transState; + @Schema(description = "紧急程度" ) + private Integer pressingType; + @Schema(description = "转交问题单编码", requiredMode = Schema.RequiredMode.REQUIRED) private String transWorkNo; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java index ce48ccd..2645d83 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java @@ -27,6 +27,7 @@ public interface AppGardenWorkOrderConvert { orderReqVO.setSourceName("园林巡查上报"); orderReqVO.setThirdWorkNo(planNo); orderReqVO.setOrderType("C"); + orderReqVO.setPressingType(createReqVO.getPressingType()); orderReqVO.setFinishDate(LocalDateTime.now()); orderReqVO.setBusiLine(inspectionPlanDO.getBusiLine()); orderReqVO.setLatLonType(3); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java index 86e44b5..a0a511d 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java @@ -169,7 +169,7 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ .inspectionState(createReqVO.getInspectionState()).transState(createReqVO.getTransState()) .transWorkNo(createReqVO.getTransWorkNo()) .userId(userId).userName(userName) - .finishTime(now).creatorName(userName).updaterName(userName) + .creatorName(userName).updaterName(userName) .remark(createReqVO.getRemark()).imgHost(createReqVO.getImgHost()).build(); inspectionPlanCommit.setCreator(userId+""); inspectionPlanCommit.setUpdater(userId+"");