diff --git a/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java index 0d842d4..1834559 100644 --- a/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java +++ b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java @@ -25,6 +25,11 @@ public class AppGardenWorkOrderReqVO { @NotNull(message = "道路ID不能为空") private Long roadId; + /** + * 工单类型 Q:快速工单,C:普通工单,O:其他工单 + */ + private String orderType; + @Schema(description = "道路名称", example = "测试道路") private String roadName; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java index 7a761de..5a9f7e8 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java @@ -132,7 +132,7 @@ public class AssignTasksController { } @Operation(summary = "任务确认" ) - @PreAuthorize("@ss.hasPermi('assign:tasks:query')") + @PreAuthorize("@ss.hasPermission('garden:assign-tasks:query')") @GetMapping(value = "/confirm/{id}") public CommonResult confirm(@PathVariable("id") Long id) { return success(assignTasksService.confirmAssignTasksById(id)); 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 c0449fc..ca971e4 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 @@ -26,6 +26,7 @@ public interface AppGardenWorkOrderConvert { orderReqVO.setSourceId(1);//来源ID 工单来源 1、巡查 orderReqVO.setSourceName("园林巡查上报"); orderReqVO.setThirdWorkNo(planNo); + orderReqVO.setOrderType("C"); orderReqVO.setFinishDate(LocalDateTime.now()); orderReqVO.setBusiLine(inspectionPlanDO.getBusiLine()); orderReqVO.setLatLonType(3); diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java index bada3e9..ef876b4 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java @@ -553,7 +553,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{ workOrder.setStreetId(roadStreetRespDTO.getStreetId()); workOrder.setStreetName(roadStreetRespDTO.getStreetName()); workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum - workOrder.setOrderType(BpmCommonConstant.ORDER_TYPE_Q); + if(StringUtil.isEmpty(createRequestVo.getOrderType())){ + workOrder.setOrderType(BpmCommonConstant.ORDER_TYPE_Q); + }else{ + workOrder.setOrderType(createRequestVo.getOrderType()); + } DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString()); if(null == dictData){ throw exception(APP_WORKER_LEVEL_ID_NOT_EXISTS);