BJ_FS / urbanops

Commit ab46c78144131ea66ad4ad8c3eb64693bdde730e

Authored by wangqian
2 parents cd73c514 8b982bed

Merge remote-tracking branch 'origin/dev' into dev

Inline Side-by-side
Showing 3 changed files with 11 additions and 1 deletions
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java
  View file @ab46c78
@@ -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/convert/AppGardenWorkOrderConvert.java
  View file @ab46c78
@@ -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 @ab46c78
@@ -540,7 +540,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{ @@ -540,7 +540,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{
540 workOrder.setStreetId(roadStreetRespDTO.getStreetId()); 540 workOrder.setStreetId(roadStreetRespDTO.getStreetId());
541 workOrder.setStreetName(roadStreetRespDTO.getStreetName()); 541 workOrder.setStreetName(roadStreetRespDTO.getStreetName());
542 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum 542 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
543 - workOrder.setOrderType(BpmCommonConstant.ORDER_TYPE_Q); 543 + if(StringUtil.isEmpty(createRequestVo.getOrderType())){
  544 + workOrder.setOrderType(BpmCommonConstant.ORDER_TYPE_Q);
  545 + }else{
  546 + workOrder.setOrderType(createRequestVo.getOrderType());
  547 + }
544 DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString()); 548 DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString());
545 if(null == dictData){ 549 if(null == dictData){
546 throw exception(APP_WORKER_LEVEL_ID_NOT_EXISTS); 550 throw exception(APP_WORKER_LEVEL_ID_NOT_EXISTS);