工单表扩展字段

颜惠青
1 parent d9a34189
Showing 9 changed files with 151 additions and 28 deletions
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/constant/BpmCommonConstant.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoPageReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskApproveReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/enums/ErrorCodeConstants.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
@@ -59,8 +59,8 @@ public class AppGardenWorkOrderReqVO {
     @NotEmpty(message = "经纬度地址不能为空")
     private String lonLatAddress;
-    @Schema(description = "紧急程度：1:特急;2:紧急;3:一般", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotNull(message = "紧急程度：1:特急;2:紧急;3:一般不能为空")
+    @Schema(description = " 养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotNull(message = "养护级别: 10:特级；11:一级：12:二级;13:三级")
     private Integer pressingType;
     @Schema(description = "工单名称", example = "绿地卫生")
@@ -11,15 +11,35 @@ public  class BpmCommonConstant {
      * 通用快速流程
      */
     public static final String COMMON_QUICK_PROCESS = "common_quick_process";
+
+    public static final String COMMON_QUICK_PROCESS_INITIATOR = "initiator";
+
     /**
      * 园林巡检工单 流程业务key
      */
+    @Deprecated
     public static final String BPM_GARDEN_INSPECT_WO = "garden_inspect_wo";
     /**
      * 园林巡检工单 通用版本
      */
     public static final String BPM_WORKORDER_COMMON_PROD = "workorder_common_prod";
+    //----------------------------------------工单初始化流程变量key----------------------
+    public static final String BPM_COMMON_PROD_ROADID = "roadId";
+    public static final String BPM_COMMON_PROD_APPLYUSERID = "applyUserId";
+
+    public static final String BPM_COMMON_PROD_LEADERID = "ylTeamLeaderId";
+
+    public static final String BPM_COMMON_PROD_WORKERID = "ylWorkerId";
+
+    public static final String BPM_COMMON_PROD_ISNEED = "isNeed";
+
+    public static final String BPM_COMMON_PROD_ISREVOKE = "isRevoke";
+
+    public static final String BPM_COMMON_PROD_ISVERIFY = "isVerify";
+
+
+    //----------------------------------------工单初始化流程变量key----------------------
     /**
      * 物业巡检工单 流程业务key
      */
@@ -28,6 +48,7 @@ public  class BpmCommonConstant {
      * 市政巡检工单 流程业务key
      */
     public static final String BPM_MUNICIPAL_INSPECT_WO = "municipal_inspect_wo";
+    //-----------------------------------------------------------------------------------
     /** 01 问题图片,02 开始图片,03 进行中图片,04 已完成图片,05 人员图片：06 材料图片
      * problemsImgs,startImgs，processingImgs，endImgs，personImgs，materialImgs
      * 园林问题单处理前图片描述
@@ -58,6 +79,7 @@ public  class BpmCommonConstant {
      * 园林工作流 组长退回的附件照片
      */
     public static final String GARDEN_TEAMLEADER_RETURN_IMG = "09";
+    //---------------------------------------------------------------
     /**
      * 园林工单编号前缀
      */
@@ -66,6 +88,12 @@ public  class BpmCommonConstant {
      * 快速工单编号前缀
      */
     public static final String WORK_ORDER_PREFFIX_QUICK = "QWO";
+    public static final String ORDER_STATUS_INIT = "000";
+
+    public static final String ORDER_TYPE_Q = "Q";
+    public static final String ORDER_TYPE_C = "C";
+    public static final String ORDER_TYPE_O = "O";
+    //---------------------------------------------------------------
     /**
      * 园林养护员 角色编码
      */
@@ -80,4 +108,7 @@ public  class BpmCommonConstant {
      */
     public static final String YL_INSPECTOR = "yl_inspector";
+    /*养护级别-字典key*/
+    public static final String CONSERVE_LEVEL = "conserve_level";
+
 }
@@ -106,4 +106,19 @@ public class MainInfoPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
+    @Schema(description = "工单类型 Q:快速工单,C:普通工单,O:其他工单", example = "C")
+    private String orderType;
+
+    @Schema(description = "工单溯源号:0 无溯源号", example = "0")
+    private String rootCauseBy;
+
+    @Schema(description = "实施人员ID", example = "12")
+    private Long workerId;
+
+    @Schema(description = "实施人员名称", example = "苞米豆")
+    private String workerName;
+
+    @Schema(description = "实施人员部门id", example = "12")
+    private Long workerCompanyId;
+
 }
 \ No newline at end of file
@@ -318,6 +318,7 @@ public class AppGardenWorkOrderController {
                     throw exception(APP_AGREE_CHOOSE);
                 }
                 assignReqVO.setAgree(status);
+                // TODO 需修改更新工单数据
                 this.ylTeamLeaderAssignWOrder(assignReqVO);
                 log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_ASSIGN.getDesc()+"<--结束");
                 return success(true);
@@ -335,7 +336,7 @@ public class AppGardenWorkOrderController {
                 this.approveTask(returnApproveReqVO);
                 log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_RETURN.getDesc()+"<--结束");
                 return success(true);
-            case YL_INSPECTOR_START_FINISH , YL_INSPECTOR_START_RELAUNCH : //巡查员结束工单,巡查员重新发起
+            case YL_INSPECTOR_START_FINISH : //巡查员结束工单
                 log.info("当前操作：养护组长结束工单（不同意）或巡查员重新发起（同意）开始，是否同意："+reqVO.getAgree()+"-->");
                 AppGardenTaskApproveReqVO inspectStartReqVO = new AppGardenTaskApproveReqVO();
                 Integer revokeStatus = reqVO.getAgree();
@@ -348,6 +349,25 @@ public class AppGardenWorkOrderController {
                 this.approveTask(inspectStartReqVO);
                 log.info("当前操作："+OperateTypeEnum.YL_INSPECTOR_START_FINISH.getDesc()+"<--结束");
                 return success(true);
+            case YL_INSPECTOR_START_RELAUNCH : //巡查员重新发起
+                log.info("当前操作："+OperateTypeEnum.YL_INSPECTOR_START_RELAUNCH.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_RETURN.getCode()+"-->");
+                // TODO 需修改更新工单数据
+                AppGardenTaskApproveReqVO reStartReqVO = new AppGardenTaskApproveReqVO();
+                Integer reStatus = reqVO.getAgree();
+                if (reStatus == null || (reStatus != 0 && reStatus != 1)) {
+                    throw exception(APP_AGREE_CHOOSE);
+                }
+                Long id = reqVO.getWorkerDataId();
+                if (id == null) {
+                    throw exception(APP_WORKER_ID_NOT_EMPTY);
+                }
+                reStartReqVO.setWorkerDataId(id);
+                reStartReqVO.setAgree(reStatus);
+                reStartReqVO.setReason(reqVO.getReason());
+                reStartReqVO.setId(reqVO.getTaskId());
+                this.approveTask(reStartReqVO);
+                log.info("当前操作："+OperateTypeEnum.YL_INSPECTOR_START_RELAUNCH.getDesc()+"<--结束");
+                return success(true);
             case YL_INSPECTOR_CHECK_PASS , YL_INSPECTOR_CHECK_REJECT ://巡查员验收通过,巡查员验收不通过
                 log.info("当前操作：巡查员验收通过 或巡查员验收不通过开始，是否同意："+reqVO.getAgree()+"-->");
                 AppGardenTaskApproveReqVO inspectReqVO = new AppGardenTaskApproveReqVO();
@@ -33,4 +33,8 @@ public class AppGardenTaskApproveReqVO {
     //@NotNull(message = "同意选择类型不能为空")
     private Integer agree;
+    @Schema(description = "工单的数据id", requiredMode = Schema.RequiredMode.REQUIRED)
+    //@NotEmpty(message = "工单的数据id不能为空")
+    private Long workerDataId;
+
 }
 \ No newline at end of file
@@ -46,6 +46,14 @@ public class MainInfoDO extends BaseDO {
      */
     private String orderName;
     /**
+     * 工单类型 Q:快速工单,C:普通工单,O:其他工单
+     */
+    private String orderType;
+    /**
+     * 工单溯源号:0 无溯源号
+     */
+    private String rootCauseBy;
+    /**
      * 来源ID
      */
     private Integer sourceId;
@@ -146,9 +154,24 @@ public class MainInfoDO extends BaseDO {
      * 工单完成结果描述
      */
     private String handleResult;
-
+    /**
+     * 共同处理人
+     */
     @TableField(typeHandler = JacksonTypeHandler.class)
     private Set<Long> coHandlers;
+    /**
+     * 实施人员ID
+     */
+    private Long workerId;
+    /**
+     * 实施人员名称
+     */
+    private String workerName;
+    /**
+     * 实施人员部门id
+     */
+    private Long workerCompanyId;
+
 }
@@ -41,6 +41,13 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
         });
         queryWrapper.eqIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo())
                 .likeIfPresent(MainInfoDO::getOrderName, reqVO.getOrderName())
+
+                .eqIfPresent(MainInfoDO::getRootCauseBy, reqVO.getRootCauseBy())
+                .eqIfPresent(MainInfoDO::getOrderType, reqVO.getOrderType())
+                .eqIfPresent(MainInfoDO::getWorkerCompanyId, reqVO.getWorkerName())
+                .eqIfPresent(MainInfoDO::getWorkerId, reqVO.getOrderType())
+                .likeIfPresent(MainInfoDO::getWorkerName, reqVO.getWorkerName())
+
                 .eqIfPresent(MainInfoDO::getSourceId, reqVO.getSourceId())
                 .likeIfPresent(MainInfoDO::getSourceName, reqVO.getSourceName())
                 .eqIfPresent(MainInfoDO::getRoadId, reqVO.getRoadId())
@@ -76,6 +83,13 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
                 .eqIfPresent(MainInfoDO::getBusiLine, reqVO.getBusiLine())
                 .likeIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo())
                 .likeIfPresent(MainInfoDO::getOrderName, reqVO.getOrderName())
+
+                .eqIfPresent(MainInfoDO::getRootCauseBy, reqVO.getRootCauseBy())
+                .eqIfPresent(MainInfoDO::getOrderType, reqVO.getOrderType())
+                .eqIfPresent(MainInfoDO::getWorkerCompanyId, reqVO.getWorkerName())
+                .eqIfPresent(MainInfoDO::getWorkerId, reqVO.getOrderType())
+                .likeIfPresent(MainInfoDO::getWorkerName, reqVO.getWorkerName())
+
                 .eqIfPresent(MainInfoDO::getSourceId, reqVO.getSourceId())
                 .likeIfPresent(MainInfoDO::getSourceName, reqVO.getSourceName())
                 .eqIfPresent(MainInfoDO::getRoadId, reqVO.getRoadId())
@@ -21,7 +21,9 @@ public interface ErrorCodeConstants {
     ErrorCode  APP_AGREE_CHOOSE = new ErrorCode(1-900-001-004, "agree状态只能为0或1");
-    ErrorCode  APP_OPERATOR_NOT_EXISTS = new ErrorCode(1-900-001-004, "无此操作类型！");
+    ErrorCode  APP_OPERATOR_NOT_EXISTS = new ErrorCode(1-900-001-005, "无此操作类型！");
-    ErrorCode  APP_WORKER_NOT_EXISTS = new ErrorCode(1-900-001-004, "养护员必须指派，不能为空！");
+    ErrorCode  APP_WORKER_NOT_EXISTS = new ErrorCode(1-900-001-006, "养护员必须指派，不能为空！");
+
+    ErrorCode  APP_WORKER_ID_NOT_EMPTY = new ErrorCode(1-900-001-007, "WorkerDataId不能为空！");
 }
@@ -2,6 +2,8 @@ package com.zteits.urbanops.module.workorder.service.garden;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zteits.urbanops.framework.common.biz.system.dict.DictDataCommonApi;
+import com.zteits.urbanops.framework.common.biz.system.dict.dto.DictDataRespDTO;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
@@ -67,6 +69,7 @@ import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCo
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0;
 import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertSet;
+import static com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant.*;
 import static com.zteits.urbanops.module.workorder.enums.ErrorCodeConstants.MAIN_INFO_NOT_EXISTS;
 import static com.zteits.urbanops.module.workorder.enums.ErrorCodeConstants.TEAM_LEADER_YL_NOT_EXISTS;
@@ -109,6 +112,9 @@ public class BpmGardenServiceImpl implements BpmGardenService{
     @Resource
     private RuntimeService runtimeService;
+    @Resource
+    private DictDataCommonApi dictDataCommonApi;
+
     /**
      * app 端快速工单入口
      * @param createRequestVo
@@ -120,7 +126,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         List<String> imgList =  createRequestVo.getImgs();
         //List<String> streetImgList = createRequestVo.getStreetImgList();
-        List<String> longRangeImgList = createRequestVo.getLongRangeImgList();
+        //List<String> longRangeImgList = createRequestVo.getLongRangeImgList();
         // 插入 工单
         MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class)
                 .setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
@@ -128,8 +134,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(createRequestVo.getRoadId());
         workOrder.setStreetId(roadStreetRespDTO.getStreetId());
         workOrder.setStreetName(roadStreetRespDTO.getStreetName());
-
-        //workOrder.setBuzStatus("t1");//需给出映射关系
+        workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
+        workOrder.setOrderType(BpmCommonConstant.ORDER_TYPE_Q);
+        DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, createRequestVo.getPressingType().toString());
+        workOrder.setCuringLevelId(Integer.valueOf(dictData.getValue()));
+        workOrder.setCuringLevelName(dictData.getLabel());
         workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId());
         workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine());
         workOrder.setUserId(SecurityFrameworkUtils.getLoginUserId());
@@ -139,14 +148,13 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         workOrder.setFinishDate(now);
         String workOrderNum = workOrderApi.generateWONum(BpmCommonConstant.WORK_ORDER_PREFFIX_QUICK);
         workOrder.setOrderNo(workOrderNum);
-        //workOrder.setOrderName("园林工单");
         workOrderMapper.insert(workOrder);
         //附件插入
-        attachmentApend(imgList,null,longRangeImgList,workOrder);
+        attachmentApend(imgList,null,null,workOrder);
         // 发起 BPM 流程
         Map<String, Object> processInstanceVariables = new HashMap<>();
-        processInstanceVariables.put("initiator", SecurityFrameworkUtils.getLoginUserId());
+        processInstanceVariables.put(COMMON_QUICK_PROCESS_INITIATOR, SecurityFrameworkUtils.getLoginUserId());
         String processInstanceId = processInstanceApi.createProcessInstance(SecurityFrameworkUtils.getLoginUserId(),
                 new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(BpmCommonConstant.COMMON_QUICK_PROCESS)
@@ -180,14 +188,16 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS,BpmTaskStatusEnum.APPROVE.getStatus());
         Integer status = reqVO.getAgree();
         if(status == null || status == 1){//status == null 此处是为了兼容老接口，防止前段少改造
-            variables.put("isNeed",false);
-            variables.put("isRevoke",false);
-            variables.put("isVerify",false);
+            variables.put(BPM_COMMON_PROD_ISNEED,false);
+            variables.put(BPM_COMMON_PROD_ISREVOKE,false);
+            variables.put(BPM_COMMON_PROD_ISVERIFY,false);
         }else {
-            variables.put("isNeed",true);
-            variables.put("isRevoke",true);
-            variables.put("isVerify",true);
+            variables.put(BPM_COMMON_PROD_ISNEED,true);
+            variables.put(BPM_COMMON_PROD_ISREVOKE,true);
+            variables.put(BPM_COMMON_PROD_ISVERIFY,true);
         }
+        //TODO  重新发起需更新工单数据库
+
         targetVO.setVariables(variables);
         //TODO 审批候选人需要赋值
         Map<String, List<Long>> nextAssignees = new HashMap<>();
@@ -201,12 +211,12 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         Map<String, Object> variables = new HashMap<>();
         //审批通过
         variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS,BpmTaskStatusEnum.APPROVE.getStatus());
-        variables.put("ylWorkerId",reqVO.getNextAssignee());
+        variables.put(BPM_COMMON_PROD_WORKERID,reqVO.getNextAssignee());
         Integer status = reqVO.getAgree();
         if(status == null || status == 0){//status == null 此处是为了兼容老接口，防止前段少改造
-            variables.put("isNeed",true);
+            variables.put(BPM_COMMON_PROD_ISNEED,true);
         }else {
-            variables.put("isNeed",false);
+            variables.put(BPM_COMMON_PROD_ISNEED,false);
         }
         targetVO.setVariables(variables);
         Map<String, List<Long>> nextAssignees = new HashMap<>();
@@ -530,14 +540,19 @@ public class BpmGardenServiceImpl implements BpmGardenService{
     public Long createWorkOrder(AppGardenWorkOrderReqVO createRequestVo) {
         List<String> imgList =  createRequestVo.getImgs();
         //List<String> streetImgList = createRequestVo.getStreetImgList();
-        List<String> longRangeImgList = createRequestVo.getLongRangeImgList();
+        //List<String> longRangeImgList = createRequestVo.getLongRangeImgList();
         MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class)
                 .setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
         RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(createRequestVo.getRoadId());
+
         workOrder.setStreetId(roadStreetRespDTO.getStreetId());
         workOrder.setStreetName(roadStreetRespDTO.getStreetName());
-        //workOrder.setBuzStatus("t1");//需给出映射关系
+        workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
+        workOrder.setOrderType(BpmCommonConstant.ORDER_TYPE_Q);
+        DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, createRequestVo.getPressingType().toString());
+        workOrder.setCuringLevelId(Integer.valueOf(dictData.getValue()));
+        workOrder.setCuringLevelName(dictData.getLabel());
         workOrder.setCommitDate(LocalDateTime.now());
         workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId());
         workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine());
@@ -546,15 +561,14 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         workOrder.setCommitDate(LocalDateTime.now());
         String workOrderNum = workOrderApi.generateWONum(BpmCommonConstant.WORK_ORDER_PREFFIX_GARDEN);
         workOrder.setOrderNo(workOrderNum);
-        //workOrder.setOrderName("园林工单");
         workOrderMapper.insert(workOrder);
         //附件插入
-        attachmentApend(imgList,null,longRangeImgList,workOrder);
+        attachmentApend(imgList,null,null,workOrder);
         // 发起 BPM 流程
         Long userId = SecurityFrameworkUtils.getLoginUserId();
         Map<String, Object> processInstanceVariables = new HashMap<>();
-        processInstanceVariables.put("roadId", workOrder.getRoadId());
-        processInstanceVariables.put("applyUserId", userId);
+        processInstanceVariables.put(BPM_COMMON_PROD_ROADID, workOrder.getRoadId());
+        processInstanceVariables.put(BPM_COMMON_PROD_APPLYUSERID, userId);
         Map<String, List<Long>> startUserSelectAssignees = new HashMap<>();
         List<AdminUserRespDTO> userList = workOrderExtMapper.getUserByRoadIdAndRoleCode(workOrder.getRoadId(),BpmCommonConstant.TEAM_LEADER_YL,createRequestVo.getBusiLine());
         if(org.springframework.util.ObjectUtils.isEmpty(userList)){
@@ -566,7 +580,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
                 .map(AdminUserRespDTO::getId)
                 // 收集结果到List
                 .collect(Collectors.toList());
-        processInstanceVariables.put("ylTeamLeaderId", idList.get(0));
+        processInstanceVariables.put(BPM_COMMON_PROD_LEADERID, idList.get(0));
         String processInstanceId = processInstanceApi.createProcessInstance(userId,
                // new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO)
         new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(BpmCommonConstant.BPM_WORKORDER_COMMON_PROD)