refactor: 修改processNo为businessCode

Closes B0061440

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/facade/ApproveFacade.java

@@ -3,7 +3,6 @@ package com.dragonsoft.dcuc.approve.facade;
 import com.dragonsoft.dcuc.approve.config.ApproveConfig;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveWorkFlowOprationEnum;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveWorkFlowTaskStateEnum;
-import com.dragonsoft.dcuc.approve.enumresources.YesNoEnum;
 import com.dragonsoft.dcuc.approve.model.req.AgentDTO;
 import com.dragonsoft.dcuc.approve.model.req.ApprovalInfoDTO;
 import com.dragonsoft.dcuc.approve.model.req.ApprovalInfoUpdateDTO;
@@ -44,6 +43,7 @@ public class ApproveFacade implements IApproveFacade {
 
     /**
      * 我的请求列表
+     *
      * @param searchable
      * @return
      */
@@ -54,11 +54,12 @@ public class ApproveFacade implements IApproveFacade {
 
     /**
      * 待办/已办列表
+     *
      * @param searchable
      * @return
      */
     @Override
-    public  Page<TaskVo> queryApproveList(Searchable searchable) {
+    public Page<TaskVo> queryApproveList(Searchable searchable) {
         //设置查询所有数据（待办）
         //todo 状态由前段传过来,考虑与其他审批混合的情况
         //searchable.addSearchParam("state_eq", "unfinish");
@@ -67,6 +68,7 @@ public class ApproveFacade implements IApproveFacade {
 
     /**
      * 我的请求列表-删除
+     *
      * @param id
      * @return
      */
@@ -77,12 +79,13 @@ public class ApproveFacade implements IApproveFacade {
 
     /**
      * 审批操作
+     *
      * @param approveOperateDTO
      * @return
      */
     @Override
     public ResponseStatus approveOperate(ApproveOperateDTO approveOperateDTO) {
-        if (!approveConfig.getAppCode().equals(approveOperateDTO.getAppCode())){
+        if (!approveConfig.getAppCode().equals(approveOperateDTO.getAppCode())) {
             return ResponseStatus.fail("非审批中心流程数据无法调用此接口");
         }
 
@@ -91,18 +94,19 @@ public class ApproveFacade implements IApproveFacade {
         approveMessage.setMessage(approveOperateDTO.getMessage());
         approveMessage.setApproveState(approveOperateDTO.getOperateType());
         taskRequest.setApproveMessage(approveMessage);
-        Map<String,String> userData = new HashMap<>();
-        userData.put("idCard",(null == UserContextUtils.getCurrentUser()) ? "" : UserContextUtils.getCurrentUser().getIdcard());
-        userData.put("userName",(null == UserContextUtils.getCurrentUser()) ? "" : UserContextUtils.getCurrentUser().getUserName());
-        userData.put("orgCode",(null == UserContextUtils.getCurrentUser()) ? "" : UserContextUtils.getCurrentUser().getSecurityOrg());
-        userData.put("orgName",(null == UserContextUtils.getCurrentUser()) ? "" : UserContextUtils.getCurrentUser().getSecurityOrgName());
-        return approveService.approveOperate(approveOperateDTO.getTaskId(),approveOperateDTO.getProcessInstanceId(),
+        Map<String, String> userData = new HashMap<>();
+        userData.put("idCard", (null == UserContextUtils.getCurrentUser()) ? "" : UserContextUtils.getCurrentUser().getIdcard());
+        userData.put("userName", (null == UserContextUtils.getCurrentUser()) ? "" : UserContextUtils.getCurrentUser().getUserName());
+        userData.put("orgCode", (null == UserContextUtils.getCurrentUser()) ? "" : UserContextUtils.getCurrentUser().getSecurityOrg());
+        userData.put("orgName", (null == UserContextUtils.getCurrentUser()) ? "" : UserContextUtils.getCurrentUser().getSecurityOrgName());
+        return approveService.approveOperate(approveOperateDTO.getTaskId(), approveOperateDTO.getProcessInstanceId(),
                 EnumUtils.enumOf(ApproveWorkFlowOprationEnum.class, approveOperateDTO.getOperateType()),
-                taskRequest,approveOperateDTO.getIdCard(),userData, approveOperateDTO.getActivitiHolderList(), approveOperateDTO.getAppCode());
+                taskRequest, approveOperateDTO.getIdCard(), userData, approveOperateDTO.getActivitiHolderList(), approveOperateDTO.getAppCode());
     }
 
     /**
      * 申请详情
+     *
      * @param id
      * @return
      */
@@ -113,6 +117,7 @@ public class ApproveFacade implements IApproveFacade {
 
     /**
      * 保存或保存并提交
+     *
      * @param approvalInfoDTO
      * @return
      */
@@ -124,6 +129,7 @@ public class ApproveFacade implements IApproveFacade {
 
     /**
      * 修改
+     *
      * @param approvalInfoDTO
      * @return
      */
@@ -135,6 +141,7 @@ public class ApproveFacade implements IApproveFacade {
 
     /**
      * 转办
+     *
      * @param agentDTO
      * @return
      */
@@ -147,6 +154,7 @@ public class ApproveFacade implements IApproveFacade {
 
     /**
      * 审批意见
+     *
      * @param businessId
      * @return
      */
@@ -164,6 +172,7 @@ public class ApproveFacade implements IApproveFacade {
 
     /**
      * 获取流程图节点详情
+     *
      * @param proInsId
      * @param statusType
      * @param taskDefinitionId
@@ -171,7 +180,7 @@ public class ApproveFacade implements IApproveFacade {
      */
     @Override
     public ResponseStatus processPicDetail(String proInsId, String statusType, String taskDefinitionId, String appCode) {
-        if (!approveConfig.getAppCode().equals(appCode)){
+        if (!approveConfig.getAppCode().equals(appCode)) {
             return ResponseDTO.newInstance();
         }
         ActivityNodeInfoVo activityNodeInfoVo = approveService.processPicDetail(proInsId, statusType, taskDefinitionId);
@@ -180,6 +189,7 @@ public class ApproveFacade implements IApproveFacade {
 
     /**
      * 申请统计
+     *
      * @param searchable
      * @return
      */
@@ -193,7 +203,7 @@ public class ApproveFacade implements IApproveFacade {
         //查询待办数量
         Searchable unfinishSearchable = Searchable.newSearchable();
         unfinishSearchable.setPage(0, 1);
-        unfinishSearchable.addSearchFilter("state",SearchOperator.eq,ApproveWorkFlowTaskStateEnum.UN_FINISH.getValue());
+        unfinishSearchable.addSearchFilter("state", SearchOperator.eq, ApproveWorkFlowTaskStateEnum.UN_FINISH.getValue());
         Integer unfinishQty = approveService.queryApproveQty(unfinishSearchable);
         //查询我的请求数量
         Integer myRequestQty = approveService.queryMyRequestQty();
@@ -207,6 +217,7 @@ public class ApproveFacade implements IApproveFacade {
 
     /**
      * 获取流程类型列表
+     *
      * @return
      */
     @Override
@@ -217,7 +228,8 @@ public class ApproveFacade implements IApproveFacade {
 
     /**
      * 获取流程类别详情
-     * @param processTypeCode   流程类别code
+     *
+     * @param processTypeCode 流程类别code
      * @return
      */
     @Override
@@ -236,7 +248,4 @@ public class ApproveFacade implements IApproveFacade {
         return approveService.queryPoliceList(userToken, appToken, page, size);
     }
 
-    private String getCurrentUserId() {
-        return (null == UserContextUtils.getCurrentUser()) ? "40288600739638db017399ff8ec60009" : UserContextUtils.getCurrentUser().getId();
-    }
 }

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/ApproveRecordInfo.java

@@ -24,7 +24,7 @@ public class ApproveRecordInfo {
     /**
      * 流程编号
      */
-    private String processNo;
+    private String businessCode;
     /**
      * 流程类型
      */

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/service/impl/ApproveServiceImpl.java

@@ -435,7 +435,7 @@ public class ApproveServiceImpl implements IApproveService {
                     for (TaskHistoryDetailVo taskDetailVo : list) {
                         //循环提交当前待办任务
                         vo = baseApproveOperate(taskDetailVo.getId(),
-                                ApproveWorkFlowOprationEnum.COMPLETE_AGREE, taskRequest, approvalInfo, approvalInfo.getApplicantIdcard(), userData, approveRecordInfo.getApproveNo(), approveRecordInfo.getProcessNo(), approveRecordInfo.getId());
+                                ApproveWorkFlowOprationEnum.COMPLETE_AGREE, taskRequest, approvalInfo, approvalInfo.getApplicantIdcard(), userData, approveRecordInfo.getApproveNo(), approveRecordInfo.getBusinessCode(), approveRecordInfo.getId());
                         if (CollectionUtils.isNotEmpty(vo.getTaskRunDetailVos())) {
                             //若存在待办任务，说明流程未结束，无需发送消息给权限中心
                             sendMessageFlag = false;
@@ -1653,7 +1653,8 @@ public class ApproveServiceImpl implements IApproveService {
     private ApprovalInfo buildApproveInfoForRecord(ApproveRecordInfo approveRecordInfo) {
         ApprovalInfo approvalInfo = new ApprovalInfo();
         BeanUtils.copyProperties(approveRecordInfo, approvalInfo);
-        approvalInfo.setBusinessCode(approveRecordInfo.getProcessNo());
+        approvalInfo.setBusinessCode(approveRecordInfo.getBusinessCode());
+        approvalInfo.setProcessInstanceId(approveRecordInfo.getProcessInstanceId());
         approvalInfo.setProcessTitle(approveRecordInfo.getProcessTitle());
         approvalInfo.setApplyReason(approveRecordInfo.getApplyReason());
         approvalInfo.setApplyContent(approveRecordInfo.getApproveContent());
@@ -1685,10 +1686,11 @@ public class ApproveServiceImpl implements IApproveService {
      * @param approveNo
      * @return
      */
-    private ApproveRecordInfo buildApproveRecordInfo(ApprovalInfo approvalInfo, ApprovalResourceInfo approvalResourceInfo, String approveNo) {
+    private ApproveRecordInfo buildApproveRecordInfo(ApprovalInfo approvalInfo, ApprovalResourceInfo approvalResourceInfo,
+                                                     String approveNo) {
         ApproveRecordInfo approveRecordInfo = new ApproveRecordInfo();
         approveRecordInfo.setId(approvalInfo.getId());
-        approveRecordInfo.setProcessNo(approvalInfo.getProcessInstanceId());
+        approveRecordInfo.setBusinessCode(approvalInfo.getBusinessCode());
         approveRecordInfo.setProcessName(approvalInfo.getProcessName());
 
         approveRecordInfo.setProcessType(approvalInfo.getProcessType());

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/service/impl/ApproveUploadServiceImpl.java

@@ -59,76 +59,77 @@ public class ApproveUploadServiceImpl implements IApproveUploadService {
 
     @Override
     public ResponseStatus approveUpload(List<ApproveRecordDTO> approveRecordList) {
-        logger.info("审批单信息保存开始，数据推送条数：【{}】",approveRecordList.size());
+        logger.info("审批单信息保存开始，数据推送条数：【{}】", approveRecordList.size());
         ApproveRecordInfo approveRecordInfo = new ApproveRecordInfo();
         try {
-            if (!ObjectUtils.isEmpty(approveRecordList)){
+            if (!ObjectUtils.isEmpty(approveRecordList)) {
                 //审批单信息处理
                 approveRecordList.forEach(
-                    approveRecord -> {
-
-                        try {
-                            BeanUtils.copyProperties(approveRecord,approveRecordInfo);
-                            approveRecordInfo.setIsDeleted(YesNoEnum.NO.getValue());
-                            approveRecordInfo.setCreateUser(approveRecord.getApplicantIdcard());
-                            approveRecordInfo.setCreateTime(DateUtils.parseDate(approveRecord.getApplyTime(), DateUtils.DATE_FORMAT_19));
-                            approveRecordInfo.setProcessTitle(approveRecord.getApproveTitle());
-                            approveRecordInfo.setTaskName("结束");
-                            approveRecordInfo.setTaskCode("end");
-                            approveRecordMapper.insert(approveRecordInfo);
-                            ApproveQueryRelation approveQueryRelation = new ApproveQueryRelation();
-                            BeanUtils.copyProperties(approveRecord,approveQueryRelation);
-                            approveQueryRelation.setIsDeleted(YesNoEnum.NO.getValue());
-                            approveQueryRelation.setCreateUser(approveRecord.getApplicantIdcard());
-                            approveQueryRelation.setCreateTime(DateUtils.parseDate(approveRecord.getApplyTime(), DateUtils.DATE_FORMAT_19));
-                            //保存关联关系
-                            approveQueryRelation.setApproveRecordId(approveRecordInfo.getId());
-                            approveQueryRelationMapper.insert(approveQueryRelation);
-                            //审批单包含流转记录处理
-                            if (!ObjectUtils.isEmpty(approveRecord.getApproveCirculationList())){
-                                approveRecord.getApproveCirculationList().forEach(
-                                        approveCirculation -> {
-                                            ApproveCirculationInfo approveCirculationInfo = new ApproveCirculationInfo();
-                                            BeanUtils.copyProperties(approveCirculation,approveCirculationInfo);
-                                            approveCirculationInfo.setApproveNo(approveRecordInfo.getApproveNo());
-                                            approveCirculationInfo.setIsDeleted(YesNoEnum.NO.getValue());
-                                            approveCirculationInfo.setCreateUser(approveCirculation.getOperateUserId());
-                                            approveCirculationInfo.setCreateTime(Timestamp.valueOf(approveCirculation.getOperateTime()));
-                                            //保存关联关系
-                                            approveCirculationInfo.setApproveRecordId(approveRecordInfo.getId());
-                                            approveCirculationMapper.insert(approveCirculationInfo);
-                                            //将审批记录转换成已办数据
-                                            ApproveActHiTask  actHiTask = new ApproveActHiTask();
-                                            actHiTask.setApplyRecordId(approveRecordInfo.getId());
-                                            actHiTask.setBusinessCode(approveRecordInfo.getProcessNo());
-                                            actHiTask.setBusinessName(approveRecordInfo.getProcessName());
-                                            actHiTask.setTaskId(approveCirculationInfo.getTaskId());
-                                            actHiTask.setTaskCode(approveCirculationInfo.getNodeNo());
-                                            actHiTask.setTaskName(approveCirculationInfo.getNodeName());
-                                            actHiTask.setOperateUserIdcard(approveCirculationInfo.getOperateUserId());
-                                            actHiTask.setOperateUserName(approveCirculationInfo.getOperateUserName());
-                                            actHiTask.setOperateType(approveCirculationInfo.getOperateType());
-                                            actHiTask.setProcessInstanceId(approveRecordInfo.getProcessInstanceId());
-                                            try {
-                                                actHiTask.setOperateTime(DateUtils.parseDate(approveCirculationInfo.getOperateTime(), DateUtils.DATE_FORMAT_19));
-                                            } catch (ParseException e) {
-
-                                            }
-                                            actHiTask.setDeleted(YesNoEnum.NO.getValue());
-                                            approveActHiTaskMapper.insert(actHiTask);
+                        approveRecord -> {
+
+                            try {
+                                BeanUtils.copyProperties(approveRecord, approveRecordInfo);
+                                approveRecordInfo.setBusinessCode(approveRecord.getProcessNo());
+                                approveRecordInfo.setIsDeleted(YesNoEnum.NO.getValue());
+                                approveRecordInfo.setCreateUser(approveRecord.getApplicantIdcard());
+                                approveRecordInfo.setCreateTime(DateUtils.parseDate(approveRecord.getApplyTime(), DateUtils.DATE_FORMAT_19));
+                                approveRecordInfo.setProcessTitle(approveRecord.getApproveTitle());
+                                approveRecordInfo.setTaskName("结束");
+                                approveRecordInfo.setTaskCode("end");
+                                approveRecordMapper.insert(approveRecordInfo);
+                                ApproveQueryRelation approveQueryRelation = new ApproveQueryRelation();
+                                BeanUtils.copyProperties(approveRecord, approveQueryRelation);
+                                approveQueryRelation.setIsDeleted(YesNoEnum.NO.getValue());
+                                approveQueryRelation.setCreateUser(approveRecord.getApplicantIdcard());
+                                approveQueryRelation.setCreateTime(DateUtils.parseDate(approveRecord.getApplyTime(), DateUtils.DATE_FORMAT_19));
+                                //保存关联关系
+                                approveQueryRelation.setApproveRecordId(approveRecordInfo.getId());
+                                approveQueryRelationMapper.insert(approveQueryRelation);
+                                //审批单包含流转记录处理
+                                if (!ObjectUtils.isEmpty(approveRecord.getApproveCirculationList())) {
+                                    approveRecord.getApproveCirculationList().forEach(
+                                            approveCirculation -> {
+                                                ApproveCirculationInfo approveCirculationInfo = new ApproveCirculationInfo();
+                                                BeanUtils.copyProperties(approveCirculation, approveCirculationInfo);
+                                                approveCirculationInfo.setApproveNo(approveRecordInfo.getApproveNo());
+                                                approveCirculationInfo.setIsDeleted(YesNoEnum.NO.getValue());
+                                                approveCirculationInfo.setCreateUser(approveCirculation.getOperateUserId());
+                                                approveCirculationInfo.setCreateTime(Timestamp.valueOf(approveCirculation.getOperateTime()));
+                                                //保存关联关系
+                                                approveCirculationInfo.setApproveRecordId(approveRecordInfo.getId());
+                                                approveCirculationMapper.insert(approveCirculationInfo);
+                                                //将审批记录转换成已办数据
+                                                ApproveActHiTask actHiTask = new ApproveActHiTask();
+                                                actHiTask.setApplyRecordId(approveRecordInfo.getId());
+                                                actHiTask.setBusinessCode(approveRecordInfo.getBusinessCode());
+                                                actHiTask.setBusinessName(approveRecordInfo.getProcessName());
+                                                actHiTask.setTaskId(approveCirculationInfo.getTaskId());
+                                                actHiTask.setTaskCode(approveCirculationInfo.getNodeNo());
+                                                actHiTask.setTaskName(approveCirculationInfo.getNodeName());
+                                                actHiTask.setOperateUserIdcard(approveCirculationInfo.getOperateUserId());
+                                                actHiTask.setOperateUserName(approveCirculationInfo.getOperateUserName());
+                                                actHiTask.setOperateType(approveCirculationInfo.getOperateType());
+                                                actHiTask.setProcessInstanceId(approveRecordInfo.getProcessInstanceId());
+                                                try {
+                                                    actHiTask.setOperateTime(DateUtils.parseDate(approveCirculationInfo.getOperateTime(), DateUtils.DATE_FORMAT_19));
+                                                } catch (ParseException e) {
+
+                                                }
+                                                actHiTask.setDeleted(YesNoEnum.NO.getValue());
+                                                approveActHiTaskMapper.insert(actHiTask);
 
 
-                                        }
-                                );
+                                            }
+                                    );
+                                }
+                            } catch (ParseException e) {
+                                e.printStackTrace();
                             }
-                        } catch (ParseException e) {
-                            e.printStackTrace();
-                        }
 
-                    }
+                        }
                 );
             }
-        }catch (Exception ex){
+        } catch (Exception ex) {
             logger.error("保存审批单失败！");
             throw new ApplicationException(ErrorCode.APPROVAL_UPLOAD_EXCEPTION.getCode(), ErrorCode.APPROVAL_UPLOAD_EXCEPTION.getMsg());
         }
@@ -143,7 +144,7 @@ public class ApproveUploadServiceImpl implements IApproveUploadService {
         where.between(ApproveRecordInfo::getCreateTime, DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()));
         where.orderByDesc(ApproveRecordInfo::getCreateTime);
         List<ApproveRecordInfo> list = approveRecordMapper.selectList(where);
-        if (CollectionUtils.isEmpty(list)){
+        if (CollectionUtils.isEmpty(list)) {
             return null;
         }
         return list.get(0);

approve-core-service/src/main/resources/config/mysql/V1_1_0006__alter_table_modif_business_code.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `t_approve_record_info`
+    CHANGE COLUMN `process_no` `business_code` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '流程编号' AFTER `id`;

approve-core-service/src/main/resources/config/oracle/V1_1_0006__alter_table_modif_business_code.sql

@@ -0,0 +1 @@
+ALTER TABLE `t_approve_record_info` rename process_no to business_code;