BJ_FS / urbanops

Commit 826838b407b1658d5fa7eced7881ef3d95da5285

Authored by 颜惠青
2 parents ffae06ed ab46c781

Merge branch 'dev' of http://gitlab1.renniting.cn/JCSS/urbanops into dev

Inline Side-by-side
Showing 4 changed files with 12 additions and 2 deletions
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java
  View file @826838b
@@ -25,6 +25,11 @@ public class AppGardenWorkOrderReqVO { @@ -25,6 +25,11 @@ public class AppGardenWorkOrderReqVO {
25 @NotNull(message = "道路ID不能为空") 25 @NotNull(message = "道路ID不能为空")
26 private Long roadId; 26 private Long roadId;
27 27
  28 + /**
  29 + * 工单类型 Q:快速工单,C:普通工单,O:其他工单
  30 + */
  31 + private String orderType;
  32 +
28 @Schema(description = "道路名称", example = "测试道路") 33 @Schema(description = "道路名称", example = "测试道路")
29 private String roadName; 34 private String roadName;
30 35
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java
  View file @826838b
@@ -132,7 +132,7 @@ public class AssignTasksController { @@ -132,7 +132,7 @@ public class AssignTasksController {
132 } 132 }
133 133
134 @Operation(summary = "任务确认" ) 134 @Operation(summary = "任务确认" )
135 - @PreAuthorize("@ss.hasPermi('assign:tasks:query')") 135 + @PreAuthorize("@ss.hasPermission('garden:assign-tasks:query')")
136 @GetMapping(value = "/confirm/{id}") 136 @GetMapping(value = "/confirm/{id}")
137 public CommonResult confirm(@PathVariable("id") Long id) { 137 public CommonResult confirm(@PathVariable("id") Long id) {
138 return success(assignTasksService.confirmAssignTasksById(id)); 138 return success(assignTasksService.confirmAssignTasksById(id));
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java
  View file @826838b
@@ -26,6 +26,7 @@ public interface AppGardenWorkOrderConvert { @@ -26,6 +26,7 @@ public interface AppGardenWorkOrderConvert {
26 orderReqVO.setSourceId(1);//来源ID 工单来源 1、巡查 26 orderReqVO.setSourceId(1);//来源ID 工单来源 1、巡查
27 orderReqVO.setSourceName("园林巡查上报"); 27 orderReqVO.setSourceName("园林巡查上报");
28 orderReqVO.setThirdWorkNo(planNo); 28 orderReqVO.setThirdWorkNo(planNo);
  29 + orderReqVO.setOrderType("C");
29 orderReqVO.setFinishDate(LocalDateTime.now()); 30 orderReqVO.setFinishDate(LocalDateTime.now());
30 orderReqVO.setBusiLine(inspectionPlanDO.getBusiLine()); 31 orderReqVO.setBusiLine(inspectionPlanDO.getBusiLine());
31 orderReqVO.setLatLonType(3); 32 orderReqVO.setLatLonType(3);
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
  View file @826838b
@@ -553,7 +553,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{ @@ -553,7 +553,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{
553 workOrder.setStreetId(roadStreetRespDTO.getStreetId()); 553 workOrder.setStreetId(roadStreetRespDTO.getStreetId());
554 workOrder.setStreetName(roadStreetRespDTO.getStreetName()); 554 workOrder.setStreetName(roadStreetRespDTO.getStreetName());
555 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum 555 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
556 - workOrder.setOrderType(BpmCommonConstant.ORDER_TYPE_Q); 556 + if(StringUtil.isEmpty(createRequestVo.getOrderType())){
  557 + workOrder.setOrderType(BpmCommonConstant.ORDER_TYPE_Q);
  558 + }else{
  559 + workOrder.setOrderType(createRequestVo.getOrderType());
  560 + }
557 DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString()); 561 DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString());
558 if(null == dictData){ 562 if(null == dictData){
559 throw exception(APP_WORKER_LEVEL_ID_NOT_EXISTS); 563 throw exception(APP_WORKER_LEVEL_ID_NOT_EXISTS);