refactor: 优化代码结构

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/IApproveBusiness.java

@@ -1,22 +1,20 @@
 package com.dragonsoft.dcuc.approve.business;
 
-import com.dragonsoft.dcuc.approve.dto.ResourceInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ResourceInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveWorkFlowOperationEnum;
 import com.dragonsoft.dcuc.approve.enumresources.FlowTypeEnum;
 import com.dragonsoft.dcuc.approve.enumresources.PageTypeEnum;
-import com.dragonsoft.dcuc.approve.model.ApprovalInfo;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
 import com.dragonsoft.dcuc.approve.model.ApproveActRunIdentityLink;
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.dragonsoft.dcuc.approve.model.req.ResourceInfoReqVO;
 import com.dragonsoft.dcuc.approve.model.resp.ApprovalInfoRespVO;
 import com.dragonsoft.dcuc.approve.model.resp.BatchTaskOperateRespVO;
-import com.dragonsoft.dcuc.approve.dto.ContentRespDTO;
-import com.dragonsoft.dcuc.approve.model.vo.ApproveMessageInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ContentRespDTO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.duwf.api.model.ProcessInstanceVO;
 import com.dragonsoft.duceap.duwf.api.model.TaskHistoryDetailVo;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -54,9 +52,9 @@ public interface IApproveBusiness {
      * 第一个节点提交的时候没有对应的已办事项
      *
      * @param processInstanceVO 实例信息
-     * @param approvalInfo      审批信息
+     * @param approvalInfoDTO      审批信息
      */
-    void createTodoAfterProcessStart(ProcessInstanceVO processInstanceVO, ApprovalInfo approvalInfo);
+    void createTodoAfterProcessStart(ProcessInstanceVO processInstanceVO, ApprovalInfoDTO approvalInfoDTO);
 
     /**
      * 检查资源
@@ -104,23 +102,23 @@ public interface IApproveBusiness {
     /**
      * 设置流程信息
      *
-     * @param approvalInfo 审批申请内容
+     * @param approvalInfoDTO 审批申请内容
      */
-    void setProcessInfo(ApprovalInfo approvalInfo);
+    void setProcessInfo(ApprovalInfoDTO approvalInfoDTO);
 
     /**
      * 设置我的请求当前结点和未操作者信息
      *
-     * @param approvalInfo 审批信息
+     * @param approvalInfoDTO 审批信息
      */
-    ApprovalInfoRespVO fillTaskInfoToApplyInfo(ApprovalInfo approvalInfo);
+    ApprovalInfoRespVO fillTaskInfoToApplyInfo(ApprovalInfoDTO approvalInfoDTO);
 
     /**
      * 更新当前结点任务
      *
-     * @param approvalInfo 审批信息
+     * @param approvalInfoDTO 审批信息
      */
-    void buildTaskInfoByProcessInstanceId(ApprovalInfo approvalInfo, List<TaskHistoryDetailVo> list);
+    void buildTaskInfoByProcessInstanceId(ApprovalInfoDTO approvalInfoDTO, List<TaskHistoryDetailVo> list);
 
     /**
      * 设置资源信息

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/service/IApproveService.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/IApproveCommonBusiness.java

@@ -1,7 +1,7 @@
-package com.dragonsoft.dcuc.approve.service;
+package com.dragonsoft.dcuc.approve.business;
 
 import com.dragoninfo.dcuc.duceap.enums.ManageDisposeTypeEnum;
-import com.dragonsoft.dcuc.approve.dto.OperateReqDTO;
+import com.dragonsoft.dcuc.approve.model.dto.OperateReqDTO;
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.dragonsoft.dcuc.approve.model.req.AgentReqVO;
 import com.dragonsoft.dcuc.approve.model.req.ApprovalInfoReqVO;
@@ -22,7 +22,7 @@ import java.util.List;
  * @version 1.0
  * @date 2021/2/3 19:43
  */
-public interface IApproveService {
+public interface IApproveCommonBusiness {
 
     /**
      * 待办/已办列表

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/IApproveLogBusiness.java

@@ -1,13 +1,13 @@
 package com.dragonsoft.dcuc.approve.business;
 
 import com.dragoninfo.dcuc.duceap.enums.ManageDisposeTypeEnum;
-import com.dragonsoft.dcuc.approve.dto.ApproveLogDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApproveLogDTO;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveResultEnum;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveWorkFlowOperationEnum;
 import com.dragonsoft.dcuc.approve.enumresources.CommitTypeEnum;
-import com.dragonsoft.dcuc.approve.model.ApprovalInfo;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
 import com.dragonsoft.dcuc.approve.model.resp.OperateRespVO;
-import com.dragonsoft.dcuc.approve.model.vo.LogDto;
+import com.dragonsoft.dcuc.approve.model.dto.LogDto;
 import com.dragonsoft.duceap.duwf.api.model.ProcessInstanceVO;
 
 /**
@@ -62,12 +62,12 @@ public interface IApproveLogBusiness {
     /**
      * 构建日志Dto
      *
-     * @param approvalInfo      审批信息
+     * @param approvalInfoDTO      审批信息
      * @param vo                实例信息
      * @param approveResultEnum 返回信息
      * @param failMsg           错误消息
      * @return 日志信息
      */
-    LogDto buildLogDto(ApprovalInfo approvalInfo, ProcessInstanceVO vo, ApproveResultEnum approveResultEnum,
+    LogDto buildLogDto(ApprovalInfoDTO approvalInfoDTO, ProcessInstanceVO vo, ApproveResultEnum approveResultEnum,
                        String failMsg, boolean needSendRedListRisk, OperateRespVO operateRespVO);
 }

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/ICacheBusiness.java

@@ -1,7 +1,7 @@
 package com.dragonsoft.dcuc.approve.business;
 
-import com.dragonsoft.dcuc.approve.dto.zerotrust.AppTokenInfoDTO;
-import com.dragonsoft.dcuc.approve.dto.zerotrust.UserTokenInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.zerotrust.AppTokenInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.zerotrust.UserTokenInfoDTO;
 
 import java.util.Date;
 

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/IBuSyncBusiness.java

@@ -1,7 +1,7 @@
 package com.dragonsoft.dcuc.approve.business.external;
 
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
-import com.dragonsoft.dcuc.approve.model.vo.ApproveMessageInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApproveMessageInfoDTO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 
 /**

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/IDcucAuthBusiness.java

@@ -1,6 +1,6 @@
 package com.dragonsoft.dcuc.approve.business.external;
 
-import com.dragonsoft.dcuc.approve.dto.ResourceInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ResourceInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.FlowTypeEnum;
 import com.dragonsoft.dcuc.approve.enumresources.ListLevelEnum;
 import com.dragonsoft.dcuc.approve.model.resp.OperateRespVO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/BuSyncBusinessImpl.java

@@ -7,13 +7,13 @@ import com.dragonsoft.dcuc.approve.business.INoticeBusiness;
 import com.dragonsoft.dcuc.approve.business.api.IApproveApiBusiness;
 import com.dragonsoft.dcuc.approve.business.external.IBuSyncBusiness;
 import com.dragonsoft.dcuc.approve.enumresources.bu.ApproveModeEnum;
-import com.dragonsoft.dcuc.approve.model.ApprovalInfo;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
 import com.dragonsoft.dcuc.approve.model.ApproveCirculationInfo;
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.dragonsoft.dcuc.approve.model.resp.bu.BuApproveSyncBizApproveReqVO;
 import com.dragonsoft.dcuc.approve.model.resp.bu.BuApproveSyncBizDataReqVO;
 import com.dragonsoft.dcuc.approve.model.resp.bu.BuApproveSyncReqVO;
-import com.dragonsoft.dcuc.approve.model.vo.ApproveMessageInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApproveMessageInfoDTO;
 import com.dragonsoft.dcuc.approve.service.IApproveCirculationService;
 import com.dragonsoft.dcuc.approve.service.IApproveRecordService;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
@@ -146,15 +146,15 @@ public class BuSyncBusinessImpl implements IBuSyncBusiness {
     @Transactional(rollbackFor = Throwable.class)
     @Override
     public ResponseStatus syncToBu(ApproveMessageInfoDTO approveMessageInfoDTO) {
-        ApprovalInfo approvalInfo = approveMessageInfoDTO.getApprovalInfo();
-        String id = approvalInfo.getId();
+        ApprovalInfoDTO approvalInfoDTO = approveMessageInfoDTO.getApprovalInfoDTO();
+        String id = approvalInfoDTO.getId();
 
         BuApproveSyncReqVO buApproveSyncReqVO = new BuApproveSyncReqVO();
-        buApproveSyncReqVO.setAppId(approvalInfo.getAppCode());
-        buApproveSyncReqVO.setAppName(approvalInfo.getAppName());
-        buApproveSyncReqVO.setCreateTime(approvalInfo.getCreateTime());
-        buApproveSyncReqVO.setFinishTime(approvalInfo.getUpdateTime());
-        buApproveSyncReqVO.setPid(approvalInfo.getApplicantIdcard());
+        buApproveSyncReqVO.setAppId(approvalInfoDTO.getAppCode());
+        buApproveSyncReqVO.setAppName(approvalInfoDTO.getAppName());
+        buApproveSyncReqVO.setCreateTime(approvalInfoDTO.getCreateTime());
+        buApproveSyncReqVO.setFinishTime(approvalInfoDTO.getUpdateTime());
+        buApproveSyncReqVO.setPid(approvalInfoDTO.getApplicantIdcard());
 
         SecurityUser securityUser = approveMessageInfoDTO.getSecurityUser();
 
@@ -166,12 +166,12 @@ public class BuSyncBusinessImpl implements IBuSyncBusiness {
         buApproveSyncReqVO.setLastReviewerUnit(securityUser.getSecurityOrgName());
 
         BuApproveSyncBizApproveReqVO buApproveSyncBizApproveReqVO = new BuApproveSyncBizApproveReqVO();
-        buApproveSyncBizApproveReqVO.setBizId(approvalInfo.getApproveNo());
-        buApproveSyncBizApproveReqVO.setBizTitle(approvalInfo.getProcessTitle());
-        buApproveSyncBizApproveReqVO.setTaskClass(approvalInfo.getApproveTaskClass());
+        buApproveSyncBizApproveReqVO.setBizId(approvalInfoDTO.getApproveNo());
+        buApproveSyncBizApproveReqVO.setBizTitle(approvalInfoDTO.getProcessTitle());
+        buApproveSyncBizApproveReqVO.setTaskClass(approvalInfoDTO.getApproveTaskClass());
         buApproveSyncBizApproveReqVO.setApproveMode(ApproveModeEnum.NORMAL.value);
-        buApproveSyncBizApproveReqVO.setBizTermStart(approvalInfo.getStartTime());
-        buApproveSyncBizApproveReqVO.setBizTermEnd(approvalInfo.getEndTime());
+        buApproveSyncBizApproveReqVO.setBizTermStart(approvalInfoDTO.getStartTime());
+        buApproveSyncBizApproveReqVO.setBizTermEnd(approvalInfoDTO.getEndTime());
 
         BuApproveSyncBizDataReqVO buApproveSyncBizDataReqVO = new BuApproveSyncBizDataReqVO();
         buApproveSyncBizDataReqVO.setBizApprove(buApproveSyncBizApproveReqVO);

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/DcucAuthBusinessImpl.java

@@ -5,7 +5,7 @@ import com.dragoninfo.dcuc.common.entity.*;
 import com.dragonsoft.auditlog.collection.qmtj.provider.IRestTemplateProvider;
 import com.dragonsoft.dcuc.approve.business.external.IDcucAuthBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
-import com.dragonsoft.dcuc.approve.dto.ResourceInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ResourceInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.FlowTypeEnum;
 import com.dragonsoft.dcuc.approve.enumresources.ListLevelEnum;
 import com.dragonsoft.dcuc.approve.enumresources.ListResourceTypeEnum;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/ZeroTrustTokenBusinessImpl.java

@@ -2,8 +2,8 @@ package com.dragonsoft.dcuc.approve.business.external.impl;
 
 import com.dragonsoft.dcuc.approve.business.ICacheBusiness;
 import com.dragonsoft.dcuc.approve.business.external.IZeroTrustTokenBusiness;
-import com.dragonsoft.dcuc.approve.dto.zerotrust.AppTokenInfoDTO;
-import com.dragonsoft.dcuc.approve.dto.zerotrust.UserTokenInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.zerotrust.AppTokenInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.zerotrust.UserTokenInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.ZeroTrustBusinessRespEnum;
 import com.dragonsoft.dcuc.approve.enumresources.ZeroTrustTokenTypeEnum;
 import com.dragonsoft.dcuc.approve.model.req.v1.token.TokenReceiveVO;

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

@@ -14,8 +14,9 @@ import com.dragonsoft.dcuc.approve.business.IApproveBusiness;
 import com.dragonsoft.dcuc.approve.business.external.IDcucAuthBusiness;
 import com.dragonsoft.dcuc.approve.business.IWorkFlowBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
-import com.dragonsoft.dcuc.approve.dto.ContentRespDTO;
-import com.dragonsoft.dcuc.approve.dto.ResourceInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ContentRespDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ResourceInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveWorkFlowOperationEnum;
 import com.dragonsoft.dcuc.approve.enumresources.CandidateTypeEnum;
 import com.dragonsoft.dcuc.approve.enumresources.FlowTypeEnum;
@@ -243,26 +244,26 @@ public class ApproveBusinessImpl implements IApproveBusiness {
      * 第一个节点提交的时候没有对应的已办事项
      *
      * @param processInstanceVO 实例信息
-     * @param approvalInfo      审批信息
+     * @param approvalInfoDTO      审批信息
      */
     @Override
-    public void createTodoAfterProcessStart(ProcessInstanceVO processInstanceVO, ApprovalInfo approvalInfo) {
+    public void createTodoAfterProcessStart(ProcessInstanceVO processInstanceVO, ApprovalInfoDTO approvalInfoDTO) {
         Date now = new Date();
         List<TaskHistoryDetailVo> taskRunDetailVos = processInstanceVO.getTaskRunDetailVos();
         for (TaskHistoryDetailVo taskHistoryDetailVo : taskRunDetailVos) {
             //待办
             ApproveActRunTask approveActRunTask = new ApproveActRunTask();
             approveActRunTask.setTaskId(taskHistoryDetailVo.getId());
-            approveActRunTask.setApplyRecordId(approvalInfo.getId());
-            approveActRunTask.setBusinessCode(approvalInfo.getBusinessCode());
-            approveActRunTask.setBusinessName(approvalInfo.getProcessName());
+            approveActRunTask.setApplyRecordId(approvalInfoDTO.getId());
+            approveActRunTask.setBusinessCode(approvalInfoDTO.getBusinessCode());
+            approveActRunTask.setBusinessName(approvalInfoDTO.getProcessName());
             approveActRunTask.setDeleted(BooleanEnum.FALSE.getValue());
             approveActRunTask.setGenerateTime(now);
             approveActRunTask.setOperateType(WorkFlowOprationEnum.COMPLETE_AGREE.getValue());
             approveActRunTask.setProcessInstanceId(processInstanceVO.getProcessInstanceId());
             approveActRunTask.setTaskCode(taskHistoryDetailVo.getTaskCode());
             approveActRunTask.setTaskName(taskHistoryDetailVo.getName());
-            approveActRunTask.setProcessTitle(approvalInfo.getProcessTitle());
+            approveActRunTask.setProcessTitle(approvalInfoDTO.getProcessTitle());
             approveActRunTaskService.save(approveActRunTask);
             //联系人
             List<ApproveActRunIdentityLink> links = this.buildActIdentityLink(taskHistoryDetailVo);
@@ -588,42 +589,42 @@ public class ApproveBusinessImpl implements IApproveBusiness {
     /**
      * 设置流程信息
      *
-     * @param approvalInfo 审批申请内容
+     * @param approvalInfoDTO 审批申请内容
      */
     @Override
-    public void setProcessInfo(ApprovalInfo approvalInfo) {
+    public void setProcessInfo(ApprovalInfoDTO approvalInfoDTO) {
         // 处理结束时间
-        approvalInfo.setEndTime(approveBaseBusiness.parseEndTime(approvalInfo.getEndTime()));
+        approvalInfoDTO.setEndTime(approveBaseBusiness.parseEndTime(approvalInfoDTO.getEndTime()));
         //获取流程类型详情
         WorkflowProcesstypeVo workflowProcesstypeVo;
         try {
             //调用工作流获取流程类型详情
-            workflowProcesstypeVo = workFlowBusiness.queryProcessType(approvalInfo.getProcessType());
+            workflowProcesstypeVo = workFlowBusiness.queryProcessType(approvalInfoDTO.getProcessType());
         } catch (ApplicationException e) {
-            log.info("流程类型标识码-Exception：【{}】", approvalInfo.getProcessType());
+            log.info("流程类型标识码-Exception：【{}】", approvalInfoDTO.getProcessType());
             throw new ApplicationException(ErrorCode.WORKFLOW_EXCEPTION.getCode(), ErrorCode.WORKFLOW_EXCEPTION.getMsg());
         }
         if (null == workflowProcesstypeVo) {
-            log.info("流程类型标识码：【{}】", approvalInfo.getProcessType());
+            log.info("流程类型标识码：【{}】", approvalInfoDTO.getProcessType());
             throw new ApplicationException(ErrorCode.WORKFLOW_TYPE_NOT_EXIST.getCode(), ErrorCode.WORKFLOW_TYPE_NOT_EXIST.getMsg());
         }
-        approvalInfo.setProcessTypeName(workflowProcesstypeVo.getName());
+        approvalInfoDTO.setProcessTypeName(workflowProcesstypeVo.getName());
         //获取流程信息
-        @NotBlank String businessCode = approvalInfo.getBusinessCode();
+        @NotBlank String businessCode = approvalInfoDTO.getBusinessCode();
         WorkflowProcessVo workflowProcessVo = workFlowBusiness.queryWorkflowProcessByBusinessCode(businessCode);
         if (null == workflowProcessVo) {
             log.info("流程标识码：【{}】", businessCode);
             throw new ApplicationException(ErrorCode.WORKFLOW_NOT_EXIST.getCode(), ErrorCode.WORKFLOW_NOT_EXIST.getMsg());
         }
-        approvalInfo.setProcessName(workflowProcessVo.getName());
+        approvalInfoDTO.setProcessName(workflowProcessVo.getName());
 
-        String processTitle = approvalInfo.getProcessTitle();
+        String processTitle = approvalInfoDTO.getProcessTitle();
         // 判断是否有流程标题，否则生成新的标题
         if (StrUtil.isBlank(processTitle)) {
             //流程标题
-            processTitle = approvalInfo.getProcessName() + "-" + approvalInfo.getApplicantName() +
-                    "-" + DateUtils.getTimeStr(approvalInfo.getCreateTime(), DateConst.HYPHEN_DISPLAY_DATE);
-            approvalInfo.setProcessTitle(processTitle);
+            processTitle = approvalInfoDTO.getProcessName() + "-" + approvalInfoDTO.getApplicantName() +
+                    "-" + DateUtils.getTimeStr(approvalInfoDTO.getCreateTime(), DateConst.HYPHEN_DISPLAY_DATE);
+            approvalInfoDTO.setProcessTitle(processTitle);
         }
 
     }
@@ -631,16 +632,16 @@ public class ApproveBusinessImpl implements IApproveBusiness {
     /**
      * 设置我的请求当前结点和未操作者信息
      *
-     * @param approvalInfo 审批信息
+     * @param approvalInfoDTO 审批信息
      */
     @Override
-    public ApprovalInfoRespVO fillTaskInfoToApplyInfo(ApprovalInfo approvalInfo) {
+    public ApprovalInfoRespVO fillTaskInfoToApplyInfo(ApprovalInfoDTO approvalInfoDTO) {
         ApprovalInfoRespVO approvalInfoRespVo = new ApprovalInfoRespVO();
-        BeanUtil.copyProperties(approvalInfo, approvalInfoRespVo);
-        approvalInfoRespVo.setResourceInfoVo(approvalInfo.getResourceInfoVo().toResourceInfoRespVO());
+        BeanUtil.copyProperties(approvalInfoDTO, approvalInfoRespVo);
+        approvalInfoRespVo.setResourceInfoVo(approvalInfoDTO.getResourceInfoVo().toResourceInfoRespVO());
 
         try {
-            String taskId = approvalInfo.getTaskId();
+            String taskId = approvalInfoDTO.getTaskId();
             if (ApproveConstants.END_STR.equalsIgnoreCase(taskId)) {
                 return approvalInfoRespVo;
             }
@@ -696,10 +697,10 @@ public class ApproveBusinessImpl implements IApproveBusiness {
     /**
      * 更新当前结点任务
      *
-     * @param approvalInfo 审批信息
+     * @param approvalInfoDTO 审批信息
      */
     @Override
-    public void buildTaskInfoByProcessInstanceId(ApprovalInfo approvalInfo, List<TaskHistoryDetailVo> list) {
+    public void buildTaskInfoByProcessInstanceId(ApprovalInfoDTO approvalInfoDTO, List<TaskHistoryDetailVo> list) {
         StringBuilder taskId = new StringBuilder();
         StringBuilder taskCode = new StringBuilder();
         StringBuilder taskName = new StringBuilder();
@@ -732,11 +733,11 @@ public class ApproveBusinessImpl implements IApproveBusiness {
             taskId = new StringBuilder(ApproveConstants.END_STR);
             taskName = new StringBuilder("结束");
         }
-        approvalInfo.setTaskId(taskId.toString());
-        approvalInfo.setTaskName(taskName.toString());
-        approvalInfo.setApproveTaskIdentifier(taskCode.toString());
-        approvalInfo.setUpdateTime(new Date());
-        approvalInfo.setUpdateUser(ProofsUtil.getIdcard());
+        approvalInfoDTO.setTaskId(taskId.toString());
+        approvalInfoDTO.setTaskName(taskName.toString());
+        approvalInfoDTO.setApproveTaskIdentifier(taskCode.toString());
+        approvalInfoDTO.setUpdateTime(new Date());
+        approvalInfoDTO.setUpdateUser(ProofsUtil.getIdcard());
     }
 
 

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

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.service.impl;
+package com.dragonsoft.dcuc.approve.business.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUnit;
@@ -11,19 +11,16 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragoninfo.dcuc.duceap.enums.ManageDisposeTypeEnum;
-import com.dragonsoft.dcuc.approve.business.IApproveBaseBusiness;
-import com.dragonsoft.dcuc.approve.business.IApproveBusiness;
-import com.dragonsoft.dcuc.approve.business.IApproveLogBusiness;
-import com.dragonsoft.dcuc.approve.business.IWorkFlowBusiness;
+import com.dragonsoft.dcuc.approve.business.*;
 import com.dragonsoft.dcuc.approve.business.external.IDcucAuthBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
-import com.dragonsoft.dcuc.approve.dto.BaseOperateReqDTO;
-import com.dragonsoft.dcuc.approve.dto.ContentRespDTO;
-import com.dragonsoft.dcuc.approve.dto.OperateReqDTO;
-import com.dragonsoft.dcuc.approve.dto.ResourceInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.BaseOperateReqDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ContentRespDTO;
+import com.dragonsoft.dcuc.approve.model.dto.OperateReqDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ResourceInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.*;
 import com.dragonsoft.dcuc.approve.event.ApproveEventPublish;
-import com.dragonsoft.dcuc.approve.model.ApprovalInfo;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
 import com.dragonsoft.dcuc.approve.model.ApproveCirculationInfo;
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.dragonsoft.dcuc.approve.model.TaskAssignRecord;
@@ -32,10 +29,10 @@ import com.dragonsoft.dcuc.approve.model.req.ApprovalInfoReqVO;
 import com.dragonsoft.dcuc.approve.model.req.ApprovalInfoUpdateReqVO;
 import com.dragonsoft.dcuc.approve.model.req.ResourceInfoReqVO;
 import com.dragonsoft.dcuc.approve.model.resp.*;
-import com.dragonsoft.dcuc.approve.model.vo.ApproveMessageInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApproveMessageInfoDTO;
 import com.dragonsoft.dcuc.approve.model.vo.ApproveTaskRequestVo;
-import com.dragonsoft.dcuc.approve.model.vo.LogDto;
-import com.dragonsoft.dcuc.approve.model.vo.TaskRequestUserInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.LogDto;
+import com.dragonsoft.dcuc.approve.model.dto.TaskRequestUserInfoDTO;
 import com.dragonsoft.dcuc.approve.properties.ApproveProperties;
 import com.dragonsoft.dcuc.approve.service.*;
 import com.dragonsoft.dcuc.approve.utils.ProofsUtil;
@@ -76,9 +73,9 @@ import java.util.stream.Collectors;
  * @date 2021/2/3 19:43
  */
 @Service
-public class ApproveServiceImpl implements IApproveService {
+public class ApproveCommonBusinessImpl implements IApproveCommonBusiness {
 
-    private static final Logger logger = LoggerFactory.getLogger(ApproveServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApproveCommonBusinessImpl.class);
 
     private ApproveProperties approveProperties;
 
@@ -86,7 +83,7 @@ public class ApproveServiceImpl implements IApproveService {
 
     private IApproveLogBusiness approveLogBusiness;
 
-    private ApproveServiceImpl approveService;
+    private ApproveCommonBusinessImpl approveService;
 
     private IApproveRecordService approveRecordService;
 
@@ -129,7 +126,7 @@ public class ApproveServiceImpl implements IApproveService {
     }
 
     @Autowired
-    public void setApproveService(ApproveServiceImpl approveService) {
+    public void setApproveService(ApproveCommonBusinessImpl approveService) {
         this.approveService = approveService;
     }
 
@@ -204,7 +201,7 @@ public class ApproveServiceImpl implements IApproveService {
     @Override
     public ApproveRecordInfo saveBase(ApprovalInfoReqVO approvalInfoReqVO, ManageDisposeTypeEnum manageDisposeTypeEnum, Date oldCreateTime) {
         ApproveRecordInfo approveRecordInfo = null;
-        ApprovalInfo approvalInfo = null;
+        ApprovalInfoDTO approvalInfoDTO = null;
         ProcessInstanceVO processInstanceVO = null;
         ApproveResultEnum approveResultEnum = ApproveResultEnum.SUCCESS;
         String failMsg = "";
@@ -213,20 +210,20 @@ public class ApproveServiceImpl implements IApproveService {
             logger.info("====开始处理表单提交,data:{}====", JSONObject.toJSONString(approvalInfoReqVO));
 
             //构建ApprovalInfo对象
-            approvalInfo = buildApprovalInfo(approvalInfoReqVO);
+            approvalInfoDTO = buildApprovalInfo(approvalInfoReqVO);
             // 设置流程相关信息
-            approveBusiness.setProcessInfo(approvalInfo);
+            approveBusiness.setProcessInfo(approvalInfoDTO);
 
             logger.info("构建申请单信息");
             // 无审批内容，默认填充数据
-            String applyContent = approvalInfo.getApplyContent();
+            String applyContent = approvalInfoDTO.getApplyContent();
             if (StrUtil.isBlank(applyContent)) {
-                String flowType = approvalInfo.getFlowType();
+                String flowType = approvalInfoDTO.getFlowType();
                 FlowTypeEnum flowTypeEnum = EnumUtils.enumOf(FlowTypeEnum.class, flowType);
                 @Valid @NotNull ResourceInfoReqVO resourceInfoReqVO = approvalInfoReqVO.getResourceInfoDTO();
                 ResourceInfoDTO resourceInfoDTO = ResourceInfoDTO.parseResourceInfoReqVO(resourceInfoReqVO);
                 ContentRespDTO contentRespDTO = approveBusiness.generalContentRespVO(flowTypeEnum, resourceInfoDTO);
-                approvalInfo.setApplyContent(JSON.toJSONString(contentRespDTO));
+                approvalInfoDTO.setApplyContent(JSON.toJSONString(contentRespDTO));
             }
             //构建ApprovalResourceInfo资源对象
             // 生成审批单号
@@ -244,14 +241,14 @@ public class ApproveServiceImpl implements IApproveService {
                 //创建流程
                 logger.info("===开始提交=====");
                 //构建ApproveTaskRequestVo，用于工作流给待办中心发送消息，需设置业务类型和业务id，因工作流对接多方应用且都需要给待办发消息
-                ApproveTaskRequestVo approveTaskRequestVo = this.buildTaskRequestVo(approvalInfo);
+                ApproveTaskRequestVo approveTaskRequestVo = this.buildTaskRequestVo(approvalInfoDTO);
                 String flowType = approvalInfoReqVO.getFlowType();
                 approveTaskRequestVo.setFlowType(flowType);
                 //构建工作流申请的taskRequest对象
                 TaskRequest<ApproveTaskRequestVo> taskRequest = new TaskRequest<>();
                 //设置自定义对象ApproveTaskRequestVo
                 taskRequest.setData(approveTaskRequestVo);
-                String userId = approvalInfo.getApplicantIdcard();
+                String userId = approvalInfoDTO.getApplicantIdcard();
                 logger.info("===提交的用户是:{}===", userId);
                 //调用工作流创建流程
                 processInstanceVO = workflowClientFactory.getWorkflowTaskClient().startTaskByCode(approvalInfoReqVO.getBusinessCode(),
@@ -259,10 +256,10 @@ public class ApproveServiceImpl implements IApproveService {
                 String processInstanceId = processInstanceVO.getProcessInstanceId();
                 List<TaskHistoryDetailVo> taskRunDetailVos = processInstanceVO.getTaskRunDetailVos();
 
-                approvalInfo.setProcessInstanceId(processInstanceId);
+                approvalInfoDTO.setProcessInstanceId(processInstanceId);
 
                 //流程开启后生成待办(刚开启的节点没有已办事宜)
-                approveBusiness.createTodoAfterProcessStart(processInstanceVO, approvalInfo);
+                approveBusiness.createTodoAfterProcessStart(processInstanceVO, approvalInfoDTO);
 
                 TaskRequestUserInfoDTO taskRequestUserInfoDTO = new TaskRequestUserInfoDTO();
                 taskRequestUserInfoDTO.setIdCard(approvalInfoReqVO.getApplicantIdcard());
@@ -276,7 +273,7 @@ public class ApproveServiceImpl implements IApproveService {
                 //构建流转的taskRequest
                 TaskRequest<ApproveTaskRequestVo> commitTaskRequest = new TaskRequest<>();
                 //再次构建taskRequest
-                this.buildTaskRequest(commitTaskRequest, approvalInfo, taskRequestUserInfoDTO, approvalInfoReqVO.getActivitiHolderList(),
+                this.buildTaskRequest(commitTaskRequest, approvalInfoDTO, taskRequestUserInfoDTO, approvalInfoReqVO.getActivitiHolderList(),
                         processInstanceVO.getTaskRunDetailVos().get(0).getId(), operateRespVO.getHitRedList());
 
                 ApproveResultEnum approveResult = ApproveResultEnum.APPROVE_ING;
@@ -288,11 +285,11 @@ public class ApproveServiceImpl implements IApproveService {
                                 .taskId(taskDetailVo.getId())
                                 .operationEnum(ApproveWorkFlowOperationEnum.COMPLETE_AGREE)
                                 .taskRequest(commitTaskRequest)
-                                .approvalInfo(approvalInfo)
+                                .approvalInfoDTO(approvalInfoDTO)
                                 .taskRequestUserInfoDTO(taskRequestUserInfoDTO)
                                 .approveNo(approveNo)
-                                .processNo(approvalInfo.getBusinessCode())
-                                .approveRecordId(approvalInfo.getId())
+                                .processNo(approvalInfoDTO.getBusinessCode())
+                                .approveRecordId(approvalInfoDTO.getId())
                                 .hitRedList(operateRespVO.getHitRedList())
                                 .build();
 
@@ -306,30 +303,30 @@ public class ApproveServiceImpl implements IApproveService {
                         logger.info("====开始执行提交后续动作====");
                         List<TaskHistoryDetailVo> afterTaskRunDetailVos = processInstanceVO.getTaskRunDetailVos();
                         approveBusiness.afterTaskCommitTask(taskDetailVo.getId(), ApproveWorkFlowOperationEnum.COMPLETE_AGREE,
-                                approvalInfo.getApplicantIdcard(), approvalInfo.getApplicantName(), afterTaskRunDetailVos);
+                                approvalInfoDTO.getApplicantIdcard(), approvalInfoDTO.getApplicantName(), afterTaskRunDetailVos);
                     }
                     logger.info("===发送消息标志:{}====", sendMessageFlag);
                     if (sendMessageFlag) {
-                        ApproveMessageInfoDTO approveMessageInfoDTO = ApproveMessageInfoDTO.newInstance(approvalInfo, ApproveWorkFlowOperationEnum.COMPLETE_AGREE, "");
+                        ApproveMessageInfoDTO approveMessageInfoDTO = ApproveMessageInfoDTO.newInstance(approvalInfoDTO, ApproveWorkFlowOperationEnum.COMPLETE_AGREE, "");
                         //发送消息
                         approveEventPublish.publishApproveFinalResultEvent(approveMessageInfoDTO);
                         approveResult = ApproveResultEnum.SUCCESS;
                     }
                 }
-                approvalInfo.setApproveResult(approveResult.value);
+                approvalInfoDTO.setApproveResult(approveResult.value);
                 //构建任务id、任务标识码、任务名称字段，多个均以,相隔
                 //需使用最新的processInstanceVO
-                approveBusiness.buildTaskInfoByProcessInstanceId(approvalInfo, processInstanceVO.getTaskRunDetailVos());
+                approveBusiness.buildTaskInfoByProcessInstanceId(approvalInfoDTO, processInstanceVO.getTaskRunDetailVos());
                 logger.info("===保存表单信息====");
                 //将原本的旧表对象构建成模式3的新表对象
             } else {
                 logger.info("===保存表单信息====");
-                approvalInfo.setUpdateTime(new Date());
-                approvalInfo.setUpdateUser(ProofsUtil.getIdcard());
+                approvalInfoDTO.setUpdateTime(new Date());
+                approvalInfoDTO.setUpdateUser(ProofsUtil.getIdcard());
             }
 
             //将原本的旧表对象构建成模式3的新表对象
-            approveRecordInfo = approveRecordService.buildApproveRecordInfo(approvalInfo, approveNo);
+            approveRecordInfo = approveRecordService.buildApproveRecordInfo(approvalInfoDTO, approveNo);
             approveRecordInfo.setCreateTime(oldCreateTime);
             //保存数据
             approveRecordService.save(approveRecordInfo);
@@ -341,9 +338,9 @@ public class ApproveServiceImpl implements IApproveService {
         } finally {
             // 获取最新的
             if (approveRecordInfo != null) {
-                approvalInfo = approveRecordInfo.toApprovalInfo();
+                approvalInfoDTO = approveRecordInfo.toApprovalInfo();
             }
-            LogDto logDto = approveLogBusiness.buildLogDto(approvalInfo, processInstanceVO, approveResultEnum, failMsg, false, null);
+            LogDto logDto = approveLogBusiness.buildLogDto(approvalInfoDTO, processInstanceVO, approveResultEnum, failMsg, false, null);
             CommitTypeEnum commitTypeEnum = EnumUtils.enumOf(CommitTypeEnum.class, approvalInfoReqVO.getOperateType());
             approveLogBusiness.buildFlowManageLogInsert(logDto, commitTypeEnum, manageDisposeTypeEnum, sendMessageFlag);
         }
@@ -356,7 +353,7 @@ public class ApproveServiceImpl implements IApproveService {
         logger.info("=======" + JSONObject.toJSONString(approvalInfoUpdateReqVO) + "========");
         ApproveRecordInfo approveRecordInfo;
         String approvalId = approvalInfoUpdateReqVO.getId();
-        ApprovalInfo approvalInfo = getApproveRecord(approvalId);
+        ApprovalInfoDTO approvalInfoDTO = getApproveRecord(approvalId);
         ProcessInstanceVO processInstanceVO = null;
         ApproveResultEnum approveResultEnum = ApproveResultEnum.SUCCESS;
         String failMsg = "";
@@ -383,45 +380,45 @@ public class ApproveServiceImpl implements IApproveService {
                 }
                 needSaveUpdateLog = false;
                 //调用保存接口
-                ApproveRecordInfo result = approveService.saveBase(approvalInfoReqVO, ManageDisposeTypeEnum.UPDATE, approvalInfo.getCreateTime());
+                ApproveRecordInfo result = approveService.saveBase(approvalInfoReqVO, ManageDisposeTypeEnum.UPDATE, approvalInfoDTO.getCreateTime());
                 return ResponseUtil.newInstance(result.getProcessInstanceId());
             } else {
                 String processTitle = approvalInfoUpdateReqVO.getProcessTitle();
                 if (StrUtil.isBlank(processTitle)) {
-                    approvalInfoUpdateReqVO.setProcessTitle(approvalInfo.getProcessTitle());
+                    approvalInfoUpdateReqVO.setProcessTitle(approvalInfoDTO.getProcessTitle());
                 }
 
                 if (StrUtil.isBlank(approvalInfoUpdateReqVO.getAppCode())) {
-                    approvalInfoUpdateReqVO.setAppCode(approvalInfo.getAppCode());
+                    approvalInfoUpdateReqVO.setAppCode(approvalInfoDTO.getAppCode());
                 }
                 if (StrUtil.isBlank(approvalInfoUpdateReqVO.getFlowType())) {
-                    approvalInfoUpdateReqVO.setFlowType(approvalInfo.getFlowType());
+                    approvalInfoUpdateReqVO.setFlowType(approvalInfoDTO.getFlowType());
                 }
                 ResourceInfoReqVO resourceInfoReqVO = approvalInfoUpdateReqVO.getResourceInfoDTO();
                 ResourceInfoDTO resourceInfoDTO = ResourceInfoDTO.parseResourceInfoReqVO(resourceInfoReqVO);
-                approvalInfo.setResourceInfoVo(resourceInfoDTO);
-                BeanUtils.copyProperties(approvalInfoUpdateReqVO, approvalInfo);
+                approvalInfoDTO.setResourceInfoVo(resourceInfoDTO);
+                BeanUtils.copyProperties(approvalInfoUpdateReqVO, approvalInfoDTO);
                 //判断有效期类型
                 String permissionValidType = approvalInfoUpdateReqVO.getPermissionValidType();
                 PermissionValidTypeEnum permissionValidTypeEnum = EnumUtils.enumOf(PermissionValidTypeEnum.class, permissionValidType);
                 if (permissionValidTypeEnum.equals(PermissionValidTypeEnum.CUSTOM)) {
                     //自定义类型，需设置开始、结束时间
-                    approvalInfo.setStartTime(approvalInfoUpdateReqVO.getStartTime());
-                    approvalInfo.setEndTime(approveBaseBusiness.parseEndTime(approvalInfoUpdateReqVO.getEndTime()));
+                    approvalInfoDTO.setStartTime(approvalInfoUpdateReqVO.getStartTime());
+                    approvalInfoDTO.setEndTime(approveBaseBusiness.parseEndTime(approvalInfoUpdateReqVO.getEndTime()));
                 } else {
                     //长期类型，开始、结束时间设置为空
-                    approvalInfo.setStartTime(null);
-                    approvalInfo.setEndTime(null);
+                    approvalInfoDTO.setStartTime(null);
+                    approvalInfoDTO.setEndTime(null);
                 }
-                approvalInfo.setUpdateTime(new Date());
-                approvalInfo.setUpdateUser(ProofsUtil.getIdcard());
-                String flowType = approvalInfo.getFlowType();
+                approvalInfoDTO.setUpdateTime(new Date());
+                approvalInfoDTO.setUpdateUser(ProofsUtil.getIdcard());
+                String flowType = approvalInfoDTO.getFlowType();
                 FlowTypeEnum flowTypeEnum = EnumUtils.enumOf(FlowTypeEnum.class, flowType);
-                @Valid @NotNull ResourceInfoDTO resourceInfoRespVO = approvalInfo.getResourceInfoVo();
+                @Valid @NotNull ResourceInfoDTO resourceInfoRespVO = approvalInfoDTO.getResourceInfoVo();
                 ContentRespDTO contentRespDTO = approveBusiness.generalContentRespVO(flowTypeEnum, resourceInfoRespVO);
-                approvalInfo.setApplyContent(JSON.toJSONString(contentRespDTO));
+                approvalInfoDTO.setApplyContent(JSON.toJSONString(contentRespDTO));
                 //构建模式3新表单表对象
-                approveRecordInfo = approveRecordService.buildApproveRecordInfo(approvalInfo, approvalInfo.getApproveNo());
+                approveRecordInfo = approveRecordService.buildApproveRecordInfo(approvalInfoDTO, approvalInfoDTO.getApproveNo());
                 approveRecordInfo.setAlreadyRedListApprove(BooleanEnum.FALSE.value);
                 //修改模式3新表单表
                 approveRecordService.updateById(approveRecordInfo);
@@ -433,7 +430,7 @@ public class ApproveServiceImpl implements IApproveService {
                 if (CommitTypeEnum.APPLY_COMMIT.equals(commitTypeEnum)) {
                     //根据实例id获取流程当前待办数组
                     List<TaskHistoryDetailVo> list = workflowClientFactory.getWorkflowProcessClient()
-                            .queryTaskDetailByProcessInstanceId(approvalInfo.getProcessInstanceId());
+                            .queryTaskDetailByProcessInstanceId(approvalInfoDTO.getProcessInstanceId());
                     TaskRequest<ApproveTaskRequestVo> taskRequest = new TaskRequest<>();
                     String applicantIdcard = approvalInfoUpdateReqVO.getApplicantIdcard();
                     TaskRequestUserInfoDTO taskRequestUserInfoDTO = new TaskRequestUserInfoDTO();
@@ -445,7 +442,7 @@ public class ApproveServiceImpl implements IApproveService {
                     OperateRespVO operateRespVO = dcucAuthBusiness.checkHitRedList(applicantIdcard, flowTypeEnum, resourceInfoRespVO);
 
                     //构建工作流请求体
-                    this.buildTaskRequest(taskRequest, approvalInfo, taskRequestUserInfoDTO, approvalInfoUpdateReqVO.getActivitiHolderList(), null, operateRespVO.getHitRedList());
+                    this.buildTaskRequest(taskRequest, approvalInfoDTO, taskRequestUserInfoDTO, approvalInfoUpdateReqVO.getActivitiHolderList(), null, operateRespVO.getHitRedList());
 
                     for (TaskHistoryDetailVo taskDetailVo : list) {
                         String taskDetailVoId = taskDetailVo.getId();
@@ -454,11 +451,11 @@ public class ApproveServiceImpl implements IApproveService {
                                 .taskId(taskDetailVoId)
                                 .operationEnum(ApproveWorkFlowOperationEnum.COMPLETE_AGREE)
                                 .taskRequest(taskRequest)
-                                .approvalInfo(approvalInfo)
+                                .approvalInfoDTO(approvalInfoDTO)
                                 .taskRequestUserInfoDTO(taskRequestUserInfoDTO)
                                 .approveNo(approveRecordInfo.getApproveNo())
-                                .processNo(approvalInfo.getBusinessCode())
-                                .approveRecordId(approvalInfo.getId())
+                                .processNo(approvalInfoDTO.getBusinessCode())
+                                .approveRecordId(approvalInfoDTO.getId())
                                 .hitRedList(operateRespVO.getHitRedList())
                                 .build();
 
@@ -471,7 +468,7 @@ public class ApproveServiceImpl implements IApproveService {
                         }
                         logger.info("工作流申请流程：【{}】,taskId:【{}】", JSON.toJSONString(processInstanceVO), taskDetailVoId);
                         //构建任务id、任务标识码、任务名称字段，多个均以,相隔
-                        approveBusiness.buildTaskInfoByProcessInstanceId(approvalInfo, taskRunDetailVos);
+                        approveBusiness.buildTaskInfoByProcessInstanceId(approvalInfoDTO, taskRunDetailVos);
 
                         //生成待办&已办
                         logger.info("=====节点提交后开始生成待办和已办=====");
@@ -481,14 +478,14 @@ public class ApproveServiceImpl implements IApproveService {
                     logger.info("====发送结果标志:{}", sendMessageFlag);
                     if (sendMessageFlag) {
                         //构建消息体并发送到kafka
-                        ApproveMessageInfoDTO approveMessageInfoDTO = ApproveMessageInfoDTO.newInstance(approvalInfo, ApproveWorkFlowOperationEnum.COMPLETE_AGREE, "");
+                        ApproveMessageInfoDTO approveMessageInfoDTO = ApproveMessageInfoDTO.newInstance(approvalInfoDTO, ApproveWorkFlowOperationEnum.COMPLETE_AGREE, "");
 
                         approveEventPublish.publishApproveFinalResultEvent(approveMessageInfoDTO);
                         approveRecordInfo.setFinalApprovalResult(ApproveResultEnum.SUCCESS.getValue());
                     }
                     logger.info("===保存表单信息====");
                     //构建任务id、任务标识码、任务名称字段，多个均以,相隔
-                    buildUpdateInfo(approveRecordInfo, approvalInfo);
+                    buildUpdateInfo(approveRecordInfo, approvalInfoDTO);
                     //修改
                     approveRecordService.updateById(approveRecordInfo);
                     needSaveOperateLog = true;
@@ -500,7 +497,7 @@ public class ApproveServiceImpl implements IApproveService {
             throw e;
         } finally {
             if (needSaveUpdateLog) {
-                LogDto logDto = approveLogBusiness.buildLogDto(approvalInfo, processInstanceVO, approveResultEnum, failMsg, false, null);
+                LogDto logDto = approveLogBusiness.buildLogDto(approvalInfoDTO, processInstanceVO, approveResultEnum, failMsg, false, null);
                 approveLogBusiness.buildFlowManageLogUpdate(logDto, needSaveOperateLog, sendMessageFlag);
             }
         }
@@ -513,22 +510,22 @@ public class ApproveServiceImpl implements IApproveService {
      * 构建工作流请求体
      *
      * @param taskRequest            任务请求
-     * @param approvalInfo           审批信息
+     * @param approvalInfoDTO           审批信息
      * @param taskRequestUserInfoDTO 用户数据
      * @param activitiHolderList     任务信息
      * @param taskId                 任务id，新增时需要手动传（因为新增的时候没有任务id可以查询）
      * @param needRedListApprove     是否需要红名单审批
      * @return 请求
      */
-    private TaskRequest<ApproveTaskRequestVo> buildTaskRequest(TaskRequest<ApproveTaskRequestVo> taskRequest, ApprovalInfo approvalInfo,
+    private TaskRequest<ApproveTaskRequestVo> buildTaskRequest(TaskRequest<ApproveTaskRequestVo> taskRequest, ApprovalInfoDTO approvalInfoDTO,
                                                                TaskRequestUserInfoDTO taskRequestUserInfoDTO, List<ActivitiHolder> activitiHolderList, String taskId,
                                                                boolean needRedListApprove) {
-        if (null == approvalInfo) {
+        if (null == approvalInfoDTO) {
             throw new IllegalArgumentException("approvalInfo is null");
         }
         String idCard;
-        if (StringUtils.isNotEmpty(approvalInfo.getApplicantIdcard())) {
-            idCard = approvalInfo.getApplicantIdcard();
+        if (StringUtils.isNotEmpty(approvalInfoDTO.getApplicantIdcard())) {
+            idCard = approvalInfoDTO.getApplicantIdcard();
         } else {
             idCard = ProofsUtil.getIdcard();
         }
@@ -546,12 +543,12 @@ public class ApproveServiceImpl implements IApproveService {
         // 判断是否需要红名单审批
         approveTaskRequestVo.setRedList(needRedListApprove);
         //设置业务表单信息
-        approveTaskRequestVo.setBusinessKey(approvalInfo.getId());
-        approveTaskRequestVo.setApplyTitle(approvalInfo.getProcessTitle());
-        approveTaskRequestVo.setApplyContent(approvalInfo.getApplyContent());
+        approveTaskRequestVo.setBusinessKey(approvalInfoDTO.getId());
+        approveTaskRequestVo.setApplyTitle(approvalInfoDTO.getProcessTitle());
+        approveTaskRequestVo.setApplyContent(approvalInfoDTO.getApplyContent());
         String appCode = approveProperties.getAppCode();
         approveTaskRequestVo.setBusinessSystem(appCode);
-        approveTaskRequestVo.setBusinessType(approvalInfo.getBusinessCode());
+        approveTaskRequestVo.setBusinessType(approvalInfoDTO.getBusinessCode());
         BaseSecurityUser userInfo = UserContextUtils.getCurrentUser();
         approveTaskRequestVo.setHandleUser(userInfo == null ? taskRequestUserInfoDTO.getIdCard() : userInfo.getIdcard());
         approveTaskRequestVo.setHandleUserName(userInfo == null ? taskRequestUserInfoDTO.getUserName() : userInfo.getUserName());
@@ -587,7 +584,7 @@ public class ApproveServiceImpl implements IApproveService {
         List<ActivitiHolder> activitiHolderList = operateReqDTO.getActivitiHolderList();
         Boolean needCheckRedList = operateReqDTO.getNeedCheckRedList();
 
-        ApprovalInfo approvalInfo = null;
+        ApprovalInfoDTO approvalInfoDTO = null;
         ProcessInstanceVO processInstanceVO = null;
         ApproveResultEnum approveResultEnum = ApproveResultEnum.SUCCESS;
         String failMsg = "";
@@ -599,32 +596,32 @@ public class ApproveServiceImpl implements IApproveService {
         try {
             //根据实例id或任务id获取申请表单并构建成旧ApprovalInfo对象
             ApproveRecordInfo approveRecordInfo = approveRecordService.findByProcessInstanceId(processInstanceId);
-            approvalInfo = approveRecordInfo.toApprovalInfo();
-            if (approvalInfo == null) {
+            approvalInfoDTO = approveRecordInfo.toApprovalInfo();
+            if (approvalInfoDTO == null) {
                 approveResultEnum = ApproveResultEnum.FAIL;
                 failMsg = "审批单不存在";
                 return ResponseUtil.dtoFail("审批单不存在");
             }
 
             // 更新审批操作设置的资源信息
-            ResourceInfoDTO resourceInfoVo = updateResourceInfo(operateReqDTO, approvalInfo.getResourceInfoVo());
-            approvalInfo.setResourceInfoVo(resourceInfoVo);
+            ResourceInfoDTO resourceInfoVo = updateResourceInfo(operateReqDTO, approvalInfoDTO.getResourceInfoVo());
+            approvalInfoDTO.setResourceInfoVo(resourceInfoVo);
 
-            String flowType = approvalInfo.getFlowType();
+            String flowType = approvalInfoDTO.getFlowType();
             FlowTypeEnum flowTypeEnum = EnumUtils.enumOf(FlowTypeEnum.class, flowType);
             ContentRespDTO contentRespDTO = approveBusiness.generalContentRespVO(flowTypeEnum, resourceInfoVo);
-            approvalInfo.setApplyContent(JSON.toJSONString(contentRespDTO));
+            approvalInfoDTO.setApplyContent(JSON.toJSONString(contentRespDTO));
 
-            String alreadyRedListApprove = approvalInfo.getAlreadyRedListApprove();
+            String alreadyRedListApprove = approvalInfoDTO.getAlreadyRedListApprove();
             TaskHistoryDetailVo taskHistoryDetailVo = workflowClientFactory.getWorkflowTaskClient().queryTaskDetail(taskId);
             String taskHistoryDetailVoName = taskHistoryDetailVo.getName();
             String taskCode = taskHistoryDetailVo.getTaskCode();
 
-            String approvalInfoTaskId = approvalInfo.getTaskId();
-            String approvalInfoId = approvalInfo.getId();
-            String approveNo = approvalInfo.getApproveNo();
-            String businessCode = approvalInfo.getBusinessCode();
-            String applicantIdcard = approvalInfo.getApplicantIdcard();
+            String approvalInfoTaskId = approvalInfoDTO.getTaskId();
+            String approvalInfoId = approvalInfoDTO.getId();
+            String approveNo = approvalInfoDTO.getApproveNo();
+            String businessCode = approvalInfoDTO.getBusinessCode();
+            String applicantIdcard = approvalInfoDTO.getApplicantIdcard();
 
             //判断操作类型是否支持
 
@@ -658,19 +655,19 @@ public class ApproveServiceImpl implements IApproveService {
                 // 1、不需要检查红名单审批，（检查红名单完调用通过的接口，不需要红名单检查）
                 // 2、还未进行红名单审批
                 // 3、不是红名单这个节点
-                String taskName = approvalInfo.getTaskName();
+                String taskName = approvalInfoDTO.getTaskName();
                 needSendRedListRisk = (!needCheckRedList) && (!alreadyRedListApproveBoolean) && (!taskName.contains(ApproveConstants.RED_LIST));
             }
 
             //构建工作流请求体
-            this.buildTaskRequest(taskRequest, approvalInfo, taskRequestUserInfoDTO, activitiHolderList, null, operateRespVO.getHitRedList());
+            this.buildTaskRequest(taskRequest, approvalInfoDTO, taskRequestUserInfoDTO, activitiHolderList, null, operateRespVO.getHitRedList());
             //节点提交
             BaseOperateReqDTO baseOperateReqDTO = BaseOperateReqDTO.builder()
                     .operateIdcard(ProofsUtil.getIdcard())
                     .taskId(taskId)
                     .operationEnum(approveWorkFlowOperationEnum)
                     .taskRequest(taskRequest)
-                    .approvalInfo(approvalInfo)
+                    .approvalInfoDTO(approvalInfoDTO)
                     .taskRequestUserInfoDTO(taskRequestUserInfoDTO)
                     .approveNo(approveNo)
                     .processNo(businessCode)
@@ -690,7 +687,7 @@ public class ApproveServiceImpl implements IApproveService {
             // 规则，不需要检查红名单、任务节点名字包含红名单、审批结果是通过
             if ((!needCheckRedList) && taskHistoryDetailVoName.contains(ApproveConstants.RED_LIST) &&
                     approveWorkFlowOperationEnum.equals(ApproveWorkFlowOperationEnum.COMPLETE_AGREE)) {
-                approvalInfo.setAlreadyRedListApprove(BooleanEnum.TRUE.value);
+                approvalInfoDTO.setAlreadyRedListApprove(BooleanEnum.TRUE.value);
             }
 
             //生成待办&已办
@@ -703,26 +700,26 @@ public class ApproveServiceImpl implements IApproveService {
                 ApproveMessage approveMessage = taskRequest.getApproveMessage();
                 String message = approveMessage.getMessage();
                 //构建消息体并发送
-                sendMessage(approveWorkFlowOperationEnum, approvalInfo, message);
+                sendMessage(approveWorkFlowOperationEnum, approvalInfoDTO, message);
                 //设置流程状态结果
                 switch (approveWorkFlowOperationEnum) {
                     case COMPLETE_AGREE:
-                        approvalInfo.setApproveResult(ApproveResultEnum.SUCCESS.getValue());
+                        approvalInfoDTO.setApproveResult(ApproveResultEnum.SUCCESS.getValue());
                         break;
                     case COMPLETE_DISAGREE:
-                        approvalInfo.setApproveResult(ApproveResultEnum.FAIL.getValue());
+                        approvalInfoDTO.setApproveResult(ApproveResultEnum.FAIL.getValue());
                         break;
                     default:
                         break;
                 }
-                approveRecordInfo.setFinalApprovalResult(approvalInfo.getApproveResult());
+                approveRecordInfo.setFinalApprovalResult(approvalInfoDTO.getApproveResult());
             }
             //构建任务id、任务标识码、任务名称字段，多个均以,相隔
-            approveBusiness.buildTaskInfoByProcessInstanceId(approvalInfo, afterTaskRunDetailVos);
+            approveBusiness.buildTaskInfoByProcessInstanceId(approvalInfoDTO, afterTaskRunDetailVos);
             logger.info("====当前任务详情:{}====", JSONObject.toJSON(afterTaskRunDetailVos));
             logger.info("====开始更新审批单信息====");
             //设置表单信息
-            buildUpdateInfo(approveRecordInfo, approvalInfo);
+            buildUpdateInfo(approveRecordInfo, approvalInfoDTO);
             //修改表单
             approveRecordService.updateById(approveRecordInfo);
         } catch (Exception e) {
@@ -732,8 +729,8 @@ public class ApproveServiceImpl implements IApproveService {
             return ResponseUtil.dtoFail(failMsg);
         } finally {
             // 有审批信息,有进行审批操作才记录日志
-            if ((approvalInfo != null) && (processInstanceVO != null)) {
-                LogDto logDto = approveLogBusiness.buildLogDto(approvalInfo, processInstanceVO,
+            if ((approvalInfoDTO != null) && (processInstanceVO != null)) {
+                LogDto logDto = approveLogBusiness.buildLogDto(approvalInfoDTO, processInstanceVO,
                         approveResultEnum, failMsg, needSendRedListRisk, operateRespVO);
                 approveLogBusiness.buildOperateLog(logDto, approveWorkFlowOperationEnum, sendMessageFlag);
             }
@@ -747,17 +744,17 @@ public class ApproveServiceImpl implements IApproveService {
      * 设置字段值
      *
      * @param approveRecordInfo 审批记录信息
-     * @param approvalInfo      审批信息
+     * @param approvalInfoDTO      审批信息
      */
-    private void buildUpdateInfo(ApproveRecordInfo approveRecordInfo, ApprovalInfo approvalInfo) {
-        approveRecordInfo.setTaskName(approvalInfo.getTaskName());
-        approveRecordInfo.setTaskId(approvalInfo.getTaskId());
-        approveRecordInfo.setTaskCode(approvalInfo.getApproveTaskIdentifier());
-        approveRecordInfo.setAlreadyRedListApprove(approvalInfo.getAlreadyRedListApprove());
+    private void buildUpdateInfo(ApproveRecordInfo approveRecordInfo, ApprovalInfoDTO approvalInfoDTO) {
+        approveRecordInfo.setTaskName(approvalInfoDTO.getTaskName());
+        approveRecordInfo.setTaskId(approvalInfoDTO.getTaskId());
+        approveRecordInfo.setTaskCode(approvalInfoDTO.getApproveTaskIdentifier());
+        approveRecordInfo.setAlreadyRedListApprove(approvalInfoDTO.getAlreadyRedListApprove());
         approveRecordInfo.setUpdateTime(new Date());
         approveRecordInfo.setUpdateUser(ProofsUtil.getIdcard());
 
-        ResourceInfoDTO resourceInfoVo = approvalInfo.getResourceInfoVo();
+        ResourceInfoDTO resourceInfoVo = approvalInfoDTO.getResourceInfoVo();
         approveBusiness.setResourceInfoData(approveRecordInfo, resourceInfoVo);
 
     }
@@ -775,14 +772,14 @@ public class ApproveServiceImpl implements IApproveService {
         String taskId = baseOperateReqDTO.getTaskId();
         ApproveWorkFlowOperationEnum approveWorkFlowOperationEnum = baseOperateReqDTO.getOperationEnum();
         TaskRequest<ApproveTaskRequestVo> taskRequest = baseOperateReqDTO.getTaskRequest();
-        ApprovalInfo approvalInfo = baseOperateReqDTO.getApprovalInfo();
+        ApprovalInfoDTO approvalInfoDTO = baseOperateReqDTO.getApprovalInfoDTO();
         TaskRequestUserInfoDTO taskRequestUserInfoDTO = baseOperateReqDTO.getTaskRequestUserInfoDTO();
         String approveNo = baseOperateReqDTO.getApproveNo();
         String processNo = baseOperateReqDTO.getProcessNo();
         String approveRecordId = baseOperateReqDTO.getApproveRecordId();
         boolean hitRedList = baseOperateReqDTO.getHitRedList();
 
-        taskRequest = buildTaskRequest(taskRequest, approvalInfo, taskRequestUserInfoDTO, null, null, hitRedList);
+        taskRequest = buildTaskRequest(taskRequest, approvalInfoDTO, taskRequestUserInfoDTO, null, null, hitRedList);
         //判断是否有审批信息，若无，默认设置
         if (null == taskRequest.getApproveMessage()) {
             ApproveMessage approveMessage = new ApproveMessage();
@@ -792,7 +789,7 @@ public class ApproveServiceImpl implements IApproveService {
         }
 
         ProcessInstanceVO vo = null;
-        logger.info("=====approveInfo->applicantIdCard:{},传入的idCard是:{}=====", approvalInfo.getApplicantIdcard(), operateIdcard);
+        logger.info("=====approveInfo->applicantIdCard:{},传入的idCard是:{}=====", approvalInfoDTO.getApplicantIdcard(), operateIdcard);
 
         logger.info("=====approveInfo->workflowClientFactory taskRequest:{}", JsonUtils.toJSONString(taskRequest));
 
@@ -926,20 +923,20 @@ public class ApproveServiceImpl implements IApproveService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseStatus deleteProcessInstance(String id) {
-        ApprovalInfo approvalInfo = null;
+        ApprovalInfoDTO approvalInfoDTO = null;
         ApproveResultEnum approveResultEnum = ApproveResultEnum.SUCCESS;
         String failMsg = "";
         try {
             //获取表单信息
-            approvalInfo = getApproveRecord(id);
-            if (approvalInfo == null) {
+            approvalInfoDTO = getApproveRecord(id);
+            if (approvalInfoDTO == null) {
                 approveResultEnum = ApproveResultEnum.FAIL;
                 failMsg = "申请单不存在";
                 return ResponseStatus.fail("申请单不存在");
             }
 
-            if (StringUtils.isNotEmpty(approvalInfo.getTaskId())) {
-                if (approvalInfo.getTaskId().equalsIgnoreCase(ApproveConstants.END_STR)) {
+            if (StringUtils.isNotEmpty(approvalInfoDTO.getTaskId())) {
+                if (approvalInfoDTO.getTaskId().equalsIgnoreCase(ApproveConstants.END_STR)) {
                     approveResultEnum = ApproveResultEnum.FAIL;
                     failMsg = "流程已结束，不允许删除";
                     return ResponseDTO.fail("流程已结束，不允许删除");
@@ -948,19 +945,19 @@ public class ApproveServiceImpl implements IApproveService {
 
             boolean callBackEnableFlag = false;
             //判断是否是草稿状态
-            if (StringUtils.isNotEmpty(approvalInfo.getProcessInstanceId())) {
+            if (StringUtils.isNotEmpty(approvalInfoDTO.getProcessInstanceId())) {
                 //1. 获取当前结点可以操作的类型
                 //2. 判断是否可以执行撤销操作，若可以执行撤销，否则返回错误信息
                 //3. 将流程实例信息(审批端)的删除标志置1
 
-                String taskIds = approvalInfo.getTaskId();
-                String taskCodes = approvalInfo.getApproveTaskIdentifier();
+                String taskIds = approvalInfoDTO.getTaskId();
+                String taskCodes = approvalInfoDTO.getApproveTaskIdentifier();
                 String[] arrTaskId = taskIds.split(",");
                 String[] arrTaskCode = taskCodes.split(",");
                 int index = 0;
                 for (String taskId : arrTaskId) {
                     logger.info("====检验当前结点是否支持撤销操作====");
-                    callBackEnableFlag = workFlowBusiness.checkOperateOptionOfCurrentStep(taskId, approvalInfo.getProcessInstanceId(), arrTaskCode[index++], OperateOptionEnum._BTN_REDO_COMMIT);
+                    callBackEnableFlag = workFlowBusiness.checkOperateOptionOfCurrentStep(taskId, approvalInfoDTO.getProcessInstanceId(), arrTaskCode[index++], OperateOptionEnum._BTN_REDO_COMMIT);
                     if (callBackEnableFlag) {
                         break;
                     }
@@ -979,7 +976,7 @@ public class ApproveServiceImpl implements IApproveService {
             }
             //执行表单表逻辑删除
             approveRecordService.deleteById(id);
-            ApproveMessageInfoDTO approveMessageInfoDTO = ApproveMessageInfoDTO.newInstance(approvalInfo, ApproveWorkFlowOperationEnum.RECALL, "");
+            ApproveMessageInfoDTO approveMessageInfoDTO = ApproveMessageInfoDTO.newInstance(approvalInfoDTO, ApproveWorkFlowOperationEnum.RECALL, "");
             approveEventPublish.publishApproveFinalResultEvent(approveMessageInfoDTO);
 
             //删除所有已办
@@ -991,7 +988,7 @@ public class ApproveServiceImpl implements IApproveService {
             approveResultEnum = ApproveResultEnum.FAIL;
             failMsg = "";
         } finally {
-            LogDto logDto = approveLogBusiness.buildLogDto(approvalInfo, null, approveResultEnum,
+            LogDto logDto = approveLogBusiness.buildLogDto(approvalInfoDTO, null, approveResultEnum,
                     failMsg, false, null);
             approveLogBusiness.buildFlowManageLogDelete(logDto);
         }
@@ -1002,11 +999,11 @@ public class ApproveServiceImpl implements IApproveService {
     @Override
     public ResponseDTO<ApprovalInfoRespVO> queryApproveDetail(String id) {
         //获取表单信息
-        ApprovalInfo approvalInfo = getApproveRecord(id);
-        if (approvalInfo == null) {
+        ApprovalInfoDTO approvalInfoDTO = getApproveRecord(id);
+        if (approvalInfoDTO == null) {
             return ResponseUtil.dtoFail("申请表单不存在");
         }
-        ApprovalInfoRespVO approvalInfoRespVO = approveBusiness.fillTaskInfoToApplyInfo(approvalInfo);
+        ApprovalInfoRespVO approvalInfoRespVO = approveBusiness.fillTaskInfoToApplyInfo(approvalInfoDTO);
         return ResponseUtil.newInstance(approvalInfoRespVO);
     }
 
@@ -1015,11 +1012,11 @@ public class ApproveServiceImpl implements IApproveService {
     public ResponseDTO<List<ProcessStatusVo>> approveStatus(String processInstanceId) {
         //获取表单信息
         ApproveRecordInfo approveRecordInfo = approveRecordService.findByProcessInstanceId(processInstanceId);
-        ApprovalInfo approvalInfo = approveRecordInfo.toApprovalInfo();
-        if (approvalInfo == null) {
+        ApprovalInfoDTO approvalInfoDTO = approveRecordInfo.toApprovalInfo();
+        if (approvalInfoDTO == null) {
             return ResponseUtil.dtoFail("无法获取审批单信息");
         }
-        String approvalInfoId = approvalInfo.getId();
+        String approvalInfoId = approvalInfoDTO.getId();
         return approveStatusByBusinessId(approvalInfoId);
     }
 
@@ -1100,22 +1097,22 @@ public class ApproveServiceImpl implements IApproveService {
     /**
      * 构建任务请求VO
      *
-     * @param approvalInfo 审批信息
+     * @param approvalInfoDTO 审批信息
      * @return 任务请求
      */
-    private ApproveTaskRequestVo buildTaskRequestVo(ApprovalInfo approvalInfo) {
+    private ApproveTaskRequestVo buildTaskRequestVo(ApprovalInfoDTO approvalInfoDTO) {
         String appCode = approveProperties.getAppCode();
         ApproveTaskRequestVo taskRequestVo = new ApproveTaskRequestVo();
-        taskRequestVo.setApplyTitle(approvalInfo.getProcessTitle());
-        taskRequestVo.setApplyContent(approvalInfo.getApplyContent());
-        taskRequestVo.setBusinessId(approvalInfo.getId());
-        taskRequestVo.setBusinessKey(approvalInfo.getId());
+        taskRequestVo.setApplyTitle(approvalInfoDTO.getProcessTitle());
+        taskRequestVo.setApplyContent(approvalInfoDTO.getApplyContent());
+        taskRequestVo.setBusinessId(approvalInfoDTO.getId());
+        taskRequestVo.setBusinessKey(approvalInfoDTO.getId());
         taskRequestVo.setBusinessSystem(appCode);
-        taskRequestVo.setBusinessType(approvalInfo.getBusinessCode());
-        taskRequestVo.setApplyUser(approvalInfo.getApplicantIdcard());
-        taskRequestVo.setApplyUserName(approvalInfo.getApplicantName());
-        taskRequestVo.setApplicantOrgCode(approvalInfo.getApplicantOrgCode());
-        taskRequestVo.setApplicantOrgName(approvalInfo.getApplicantOrgName());
+        taskRequestVo.setBusinessType(approvalInfoDTO.getBusinessCode());
+        taskRequestVo.setApplyUser(approvalInfoDTO.getApplicantIdcard());
+        taskRequestVo.setApplyUserName(approvalInfoDTO.getApplicantName());
+        taskRequestVo.setApplicantOrgCode(approvalInfoDTO.getApplicantOrgCode());
+        taskRequestVo.setApplicantOrgName(approvalInfoDTO.getApplicantOrgName());
         return taskRequestVo;
     }
 
@@ -1126,7 +1123,7 @@ public class ApproveServiceImpl implements IApproveService {
      * @param id 审批记录id
      * @return 审批信息
      */
-    public ApprovalInfo getApproveRecord(String id) {
+    public ApprovalInfoDTO getApproveRecord(String id) {
         //表单查询
         ApproveRecordInfo approveRecordInfo = approveRecordService.selectOne(id);
         if (approveRecordInfo != null) {
@@ -1141,26 +1138,26 @@ public class ApproveServiceImpl implements IApproveService {
      * @param approvalInfoReqVO 审批信息
      * @return 审批信息
      */
-    private ApprovalInfo buildApprovalInfo(ApprovalInfoReqVO approvalInfoReqVO) {
-        ApprovalInfo approvalInfo = new ApprovalInfo();
-        BeanUtil.copyProperties(approvalInfoReqVO, approvalInfo);
-        approvalInfo.setIsDeleted(BooleanEnum.FALSE.getValue());
-        approvalInfo.setCreateUser(StringUtils.isNotEmpty(approvalInfoReqVO.getApplicantIdcard()) ? approvalInfoReqVO.getApplicantIdcard()
+    private ApprovalInfoDTO buildApprovalInfo(ApprovalInfoReqVO approvalInfoReqVO) {
+        ApprovalInfoDTO approvalInfoDTO = new ApprovalInfoDTO();
+        BeanUtil.copyProperties(approvalInfoReqVO, approvalInfoDTO);
+        approvalInfoDTO.setIsDeleted(BooleanEnum.FALSE.getValue());
+        approvalInfoDTO.setCreateUser(StringUtils.isNotEmpty(approvalInfoReqVO.getApplicantIdcard()) ? approvalInfoReqVO.getApplicantIdcard()
                 : ProofsUtil.getIdcard());
-        approvalInfo.setId(UUIDUtils.getUUID());
-        approvalInfo.setCreateTime(new Date());
+        approvalInfoDTO.setId(UUIDUtils.getUUID());
+        approvalInfoDTO.setCreateTime(new Date());
 
         @Valid @NotNull ResourceInfoReqVO resourceInfoRespVO = approvalInfoReqVO.getResourceInfoDTO();
 
         ResourceInfoDTO resourceInfoDTO = ResourceInfoDTO.parseResourceInfoReqVO(resourceInfoRespVO);
-        approvalInfo.setResourceInfoVo(resourceInfoDTO);
+        approvalInfoDTO.setResourceInfoVo(resourceInfoDTO);
 
-        approvalInfo.setCallbackUrl(approvalInfoReqVO.getCallbackUrl());
-        approvalInfo.setApproveTaskClass(approvalInfoReqVO.getApproveTaskClass());
-        approvalInfo.setApplicantIp(approvalInfoReqVO.getApplicantIp());
-        approvalInfo.setApplicantAppToken(approvalInfoReqVO.getApplicantAppToken());
+        approvalInfoDTO.setCallbackUrl(approvalInfoReqVO.getCallbackUrl());
+        approvalInfoDTO.setApproveTaskClass(approvalInfoReqVO.getApproveTaskClass());
+        approvalInfoDTO.setApplicantIp(approvalInfoReqVO.getApplicantIp());
+        approvalInfoDTO.setApplicantAppToken(approvalInfoReqVO.getApplicantAppToken());
 
-        return approvalInfo;
+        return approvalInfoDTO;
     }
 
 
@@ -1197,11 +1194,11 @@ public class ApproveServiceImpl implements IApproveService {
      * 发送消息
      *
      * @param approveWorkFlowOperationEnum 操作类型
-     * @param approvalInfo                 审批信息
+     * @param approvalInfoDTO                 审批信息
      */
-    protected void sendMessage(ApproveWorkFlowOperationEnum approveWorkFlowOperationEnum, ApprovalInfo approvalInfo, String approveMessage) {
+    protected void sendMessage(ApproveWorkFlowOperationEnum approveWorkFlowOperationEnum, ApprovalInfoDTO approvalInfoDTO, String approveMessage) {
         //构建消息体并发送
-        ApproveMessageInfoDTO approveMessageInfoDTO = ApproveMessageInfoDTO.newInstance(approvalInfo, approveWorkFlowOperationEnum, approveMessage);
+        ApproveMessageInfoDTO approveMessageInfoDTO = ApproveMessageInfoDTO.newInstance(approvalInfoDTO, approveWorkFlowOperationEnum, approveMessage);
         approveEventPublish.publishApproveFinalResultEvent(approveMessageInfoDTO);
     }
 

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

@@ -15,15 +15,16 @@ import com.dragonsoft.dcuc.approve.business.IApproveLogBusiness;
 import com.dragonsoft.dcuc.approve.business.IRiskBusiness;
 import com.dragonsoft.dcuc.approve.business.external.IDcucBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
-import com.dragonsoft.dcuc.approve.dto.ApproveLogDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApproveLogDTO;
 import com.dragonsoft.dcuc.approve.enumresources.*;
 import com.dragonsoft.dcuc.approve.event.ApproveEventPublish;
 import com.dragonsoft.dcuc.approve.model.*;
 import com.dragonsoft.dcuc.approve.model.resp.OperateRespVO;
-import com.dragonsoft.dcuc.approve.model.vo.LogDto;
-import com.dragonsoft.dcuc.approve.model.vo.LogInfoMetaDTO;
-import com.dragonsoft.dcuc.approve.model.vo.ProcessInstanceInfoDTO;
-import com.dragonsoft.dcuc.approve.model.vo.QmOperateLogDTO;
+import com.dragonsoft.dcuc.approve.model.dto.LogDto;
+import com.dragonsoft.dcuc.approve.model.dto.LogInfoMetaDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ProcessInstanceInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.QmOperateLogDTO;
 import com.dragonsoft.dcuc.approve.model.vo.dcuc.OauthUserVO;
 import com.dragonsoft.dcuc.approve.properties.ApproveProperties;
 import com.dragonsoft.dcuc.approve.service.*;
@@ -183,13 +184,13 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
     private void buildRequestLog(String disposeType, LogDto logDto, String flowNodeCode, String flowNodeName,
                                  String taskKey, String flowKey, String processInstanceId, String businessCode) {
 
-        ApprovalInfo approvalInfo = logDto.getApprovalInfo();
+        ApprovalInfoDTO approvalInfoDTO = logDto.getApprovalInfoDTO();
         RequestLog requestLog = new RequestLog();
-        requestLog.setIdcard(approvalInfo.getApplicantIdcard());
-        requestLog.setOrgName(approvalInfo.getApplicantOrgName());
-        requestLog.setOrgCode(approvalInfo.getApplicantOrgCode());
-        requestLog.setBusinessCode(approvalInfo.getBusinessCode());
-        requestLog.setTitle(approvalInfo.getProcessTitle());
+        requestLog.setIdcard(approvalInfoDTO.getApplicantIdcard());
+        requestLog.setOrgName(approvalInfoDTO.getApplicantOrgName());
+        requestLog.setOrgCode(approvalInfoDTO.getApplicantOrgCode());
+        requestLog.setBusinessCode(approvalInfoDTO.getBusinessCode());
+        requestLog.setTitle(approvalInfoDTO.getProcessTitle());
         requestLog.setDisposeType(disposeType);
         requestLog.setResult(logDto.getResult());
         requestLog.setFailMsg(logDto.getFailMsg());
@@ -201,9 +202,9 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
         requestLog.setCreateTime(new Date());
         requestLog.setFlowNodeCode(flowNodeCode);
         requestLog.setFlowNodeName(flowNodeName);
-        requestLog.setApproveRecordId(approvalInfo.getId());
+        requestLog.setApproveRecordId(approvalInfoDTO.getId());
         requestLog.setProcessInstanceId(processInstanceId);
-        requestLog.setApproveNo(approvalInfo.getApproveNo());
+        requestLog.setApproveNo(approvalInfoDTO.getApproveNo());
         //发送审批请求日志到消息中心
         logger.info("=====发送审批申请请求日志-发起消息,消息体为：{}====", JSON.toJSONString(requestLog));
         LogInfoMetaDTO logInfoMetaDTO = new LogInfoMetaDTO();
@@ -227,7 +228,7 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
      */
     private void buildOperateLogAndSend(LogDto dto, OperateDisposeTypeEnum operateDisposeTypeEnum,
                                         ProcessInstanceInfoDTO processInstanceInfoDTO, Boolean flowFinish) {
-        ApprovalInfo approvalInfo = dto.getApprovalInfo();
+        ApprovalInfoDTO approvalInfoDTO = dto.getApprovalInfoDTO();
 
         String failMsg = dto.getFailMsg();
         if (failMsg.length() > 1000) {
@@ -235,11 +236,11 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
         }
 
         OperateLog operateLog = new OperateLog();
-        operateLog.setIdcard(approvalInfo.getApplicantIdcard());
-        operateLog.setOrgName(approvalInfo.getApplicantOrgName());
-        operateLog.setOrgCode(approvalInfo.getApplicantOrgCode());
-        operateLog.setBusinessCode(approvalInfo.getBusinessCode());
-        operateLog.setTitle(approvalInfo.getProcessTitle());
+        operateLog.setIdcard(approvalInfoDTO.getApplicantIdcard());
+        operateLog.setOrgName(approvalInfoDTO.getApplicantOrgName());
+        operateLog.setOrgCode(approvalInfoDTO.getApplicantOrgCode());
+        operateLog.setBusinessCode(approvalInfoDTO.getBusinessCode());
+        operateLog.setTitle(approvalInfoDTO.getProcessTitle());
         operateLog.setDisposeType(operateDisposeTypeEnum.value);
         operateLog.setResult(dto.getResult());
         operateLog.setFailMsg(failMsg);
@@ -251,9 +252,9 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
         operateLog.setCreateTime(dto.getCreateTime());
         operateLog.setFlowNodeCode(processInstanceInfoDTO.getFlowNodeCode());
         operateLog.setFlowNodeName(processInstanceInfoDTO.getFlowNodeName());
-        operateLog.setApproveRecordId(approvalInfo.getId());
+        operateLog.setApproveRecordId(approvalInfoDTO.getId());
         operateLog.setProcessInstanceId(processInstanceInfoDTO.getProcessInstanceId());
-        operateLog.setApproveNo(approvalInfo.getApproveNo());
+        operateLog.setApproveNo(approvalInfoDTO.getApproveNo());
 
         LogInfoMetaDTO logInfoMetaDTO = new LogInfoMetaDTO();
         logInfoMetaDTO.setLogType(LogTypeEnum.OPERATE_LOG.getValue());
@@ -688,20 +689,20 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
             taskDefinitionKey = processInstanceVO.getTaskHistoryDetailVo().getTaskDefinitionKey();
         }
 
-        ApprovalInfo approvalInfo = logDto.getApprovalInfo();
+        ApprovalInfoDTO approvalInfoDTO = logDto.getApprovalInfoDTO();
 
         FlowManageLog flowManageLog = new FlowManageLog();
         BeanUtils.copyProperties(logDto, flowManageLog);
-        flowManageLog.setIdcard(approvalInfo.getApplicantIdcard());
-        flowManageLog.setOrgName(approvalInfo.getApplicantOrgName());
-        flowManageLog.setOrgCode(approvalInfo.getApplicantOrgCode());
-        flowManageLog.setBusinessCode(approvalInfo.getBusinessCode());
-        flowManageLog.setTitle(approvalInfo.getProcessTitle());
+        flowManageLog.setIdcard(approvalInfoDTO.getApplicantIdcard());
+        flowManageLog.setOrgName(approvalInfoDTO.getApplicantOrgName());
+        flowManageLog.setOrgCode(approvalInfoDTO.getApplicantOrgCode());
+        flowManageLog.setBusinessCode(approvalInfoDTO.getBusinessCode());
+        flowManageLog.setTitle(approvalInfoDTO.getProcessTitle());
         flowManageLog.setDisposeType(manageDisposeTypeEnum.value);
         //操作内容策划不知道要存什么，暂时放空
 //        flowManageLog.setOperateContent(JSON.toJSONString(logDto.getApprovalInfo()));
-        flowManageLog.setApproveRecordId(approvalInfo.getId());
-        flowManageLog.setApproveNo(approvalInfo.getApproveNo());
+        flowManageLog.setApproveRecordId(approvalInfoDTO.getId());
+        flowManageLog.setApproveNo(approvalInfoDTO.getApproveNo());
         flowManageLog.setProcessInstanceId(processInstanceId);
         //发送审批流程管理日志到消息中心
         logger.info("=====发送审批流程管理日志消息,消息体为：{}====", JSON.toJSONString(flowManageLog));
@@ -747,14 +748,14 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
     /**
      * 构建日志Dto
      *
-     * @param approvalInfo      审批信息
+     * @param approvalInfoDTO      审批信息
      * @param vo                实例信息
      * @param approveResultEnum 返回信息
      * @param failMsg           错误消息
      * @return 日志信息
      */
     @Override
-    public LogDto buildLogDto(ApprovalInfo approvalInfo, ProcessInstanceVO vo, ApproveResultEnum approveResultEnum,
+    public LogDto buildLogDto(ApprovalInfoDTO approvalInfoDTO, ProcessInstanceVO vo, ApproveResultEnum approveResultEnum,
                               String failMsg, boolean needSendRedListRisk, OperateRespVO operateRespVO) {
         ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         assert servletRequestAttributes != null;
@@ -782,7 +783,7 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
         logDto.setOperateContent("");
         logDto.setCreateUser(createUser);
         logDto.setCreateUserName(createUserName);
-        logDto.setApprovalInfo(approvalInfo);
+        logDto.setApprovalInfoDTO(approvalInfoDTO);
         logDto.setProcessInstanceVO(vo);
         logDto.setFailMsg(failMsg);
         logDto.setResult(approveResultEnum.value);

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

@@ -4,8 +4,8 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.dragonsoft.dcuc.approve.business.ICacheBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveRedisConstants;
-import com.dragonsoft.dcuc.approve.dto.zerotrust.AppTokenInfoDTO;
-import com.dragonsoft.dcuc.approve.dto.zerotrust.UserTokenInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.zerotrust.AppTokenInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.zerotrust.UserTokenInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.ZeroTrustTokenActionEnum;
 import com.dragonsoft.duceap.commons.util.date.DateConst;
 import com.dragonsoft.duceap.commons.util.date.DateUtils;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/event/ApproveEventPublish.java

@@ -1,13 +1,13 @@
 package com.dragonsoft.dcuc.approve.event;
 
-import com.dragonsoft.dcuc.approve.dto.ApproveLogDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApproveLogDTO;
 import com.dragonsoft.dcuc.approve.event.event.ApproveFinalResultEvent;
 import com.dragonsoft.dcuc.approve.event.event.ApproveLogEvent;
 import com.dragonsoft.dcuc.approve.event.event.ApproveRiskLogEvent;
 import com.dragonsoft.dcuc.approve.event.event.AuditApproveOperateLogEvent;
 import com.dragonsoft.dcuc.approve.model.RiskLog;
-import com.dragonsoft.dcuc.approve.model.vo.ApproveMessageInfoDTO;
-import com.dragonsoft.dcuc.approve.model.vo.QmOperateLogDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApproveMessageInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.QmOperateLogDTO;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/event/event/ApproveFinalResultEvent.java

@@ -1,6 +1,6 @@
 package com.dragonsoft.dcuc.approve.event.event;
 
-import com.dragonsoft.dcuc.approve.model.vo.ApproveMessageInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApproveMessageInfoDTO;
 import org.springframework.context.ApplicationEvent;
 
 /**

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/event/event/ApproveLogEvent.java

@@ -1,6 +1,6 @@
 package com.dragonsoft.dcuc.approve.event.event;
 
-import com.dragonsoft.dcuc.approve.dto.ApproveLogDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApproveLogDTO;
 import org.springframework.context.ApplicationEvent;
 
 /**

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/event/event/AuditApproveOperateLogEvent.java

@@ -1,6 +1,6 @@
 package com.dragonsoft.dcuc.approve.event.event;
 
-import com.dragonsoft.dcuc.approve.model.vo.QmOperateLogDTO;
+import com.dragonsoft.dcuc.approve.model.dto.QmOperateLogDTO;
 import org.springframework.context.ApplicationEvent;
 
 /**

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/event/listener/ApproveLogListener.java

@@ -1,7 +1,7 @@
 package com.dragonsoft.dcuc.approve.event.listener;
 
 import com.dragonsoft.dcuc.approve.business.IApproveLogBusiness;
-import com.dragonsoft.dcuc.approve.dto.ApproveLogDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApproveLogDTO;
 import com.dragonsoft.dcuc.approve.event.event.ApproveLogEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/event/listener/ApproveOperateLogEventListener.java

@@ -5,7 +5,7 @@ import com.dragonsoft.auditlog.collection.qmtj.LogSendComponent;
 import com.dragonsoft.auditlog.collection.qmtj.pojo.req.ApproveBusLog;
 import com.dragonsoft.dcuc.approve.enumresources.QmApproveTypeEnum;
 import com.dragonsoft.dcuc.approve.event.event.AuditApproveOperateLogEvent;
-import com.dragonsoft.dcuc.approve.model.vo.QmOperateLogDTO;
+import com.dragonsoft.dcuc.approve.model.dto.QmOperateLogDTO;
 import com.dragonsoft.dcuc.approve.properties.ApproveProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/event/listener/DcmsSendFinalResultListener.java

@@ -4,8 +4,8 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.dragoninfo.duceap.commons.util.kafka.KafkaServer;
 import com.dragonsoft.dcuc.approve.event.event.ApproveFinalResultEvent;
-import com.dragonsoft.dcuc.approve.model.vo.ApprovalInfoMsgItemDTO;
-import com.dragonsoft.dcuc.approve.model.vo.ApproveMessageInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoMsgItemDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApproveMessageInfoDTO;
 import com.dragonsoft.dcuc.approve.properties.ApproveProperties;
 import com.dragonsoft.dcuc.approve.properties.KafkaProperties;
 import com.dragonsoft.duceap.commons.util.UUIDUtils;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/event/listener/HttpCallbackSendFinalResultListener.java

@@ -8,8 +8,8 @@ import com.dragonsoft.dcuc.approve.enumresources.ZeroTrustApproveEndEnum;
 import com.dragonsoft.dcuc.approve.enumresources.ZeroTrustEndFlagEnum;
 import com.dragonsoft.dcuc.approve.event.event.ApproveFinalResultEvent;
 import com.dragonsoft.dcuc.approve.model.req.v3.ZeroTrustApproveCallbackReqV3VO;
-import com.dragonsoft.dcuc.approve.model.vo.ApprovalInfoMsgItemDTO;
-import com.dragonsoft.dcuc.approve.model.vo.ApproveMessageInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoMsgItemDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApproveMessageInfoDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/event/listener/RzySyslogSendRiskInfoEventListener.java

@@ -2,7 +2,7 @@ package com.dragonsoft.dcuc.approve.event.listener;
 
 import com.dragonsoft.dcuc.approve.constants.ApproveBeanConstants;
 import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
-import com.dragonsoft.dcuc.approve.dto.RzyRiskLogDTO;
+import com.dragonsoft.dcuc.approve.model.dto.RzyRiskLogDTO;
 import com.dragonsoft.dcuc.approve.event.event.ApproveRiskLogEvent;
 import com.dragonsoft.dcuc.approve.model.RiskLog;
 import com.fasterxml.jackson.core.JsonProcessingException;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/event/listener/SyncToBuSendFinalResultListener.java

@@ -4,7 +4,7 @@ import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragonsoft.dcuc.approve.business.external.IBuSyncBusiness;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveWorkFlowOperationEnum;
 import com.dragonsoft.dcuc.approve.event.event.ApproveFinalResultEvent;
-import com.dragonsoft.dcuc.approve.model.vo.ApproveMessageInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApproveMessageInfoDTO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -7,23 +7,23 @@ import com.dragonsoft.dcuc.approve.business.IApproveTipsBusiness;
 import com.dragonsoft.dcuc.approve.business.external.IDcucAuthBusiness;
 import com.dragonsoft.dcuc.approve.business.IWorkFlowBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
-import com.dragonsoft.dcuc.approve.dto.OperateReqDTO;
-import com.dragonsoft.dcuc.approve.dto.ResourceInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.OperateReqDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ResourceInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveWorkFlowOperationEnum;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveWorkFlowTaskStateEnum;
 import com.dragonsoft.dcuc.approve.enumresources.FlowTypeEnum;
 import com.dragonsoft.dcuc.approve.enumresources.PageTypeEnum;
-import com.dragonsoft.dcuc.approve.model.ApprovalInfo;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
 import com.dragonsoft.dcuc.approve.model.ApproveCirculationInfo;
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.dragonsoft.dcuc.approve.model.req.*;
 import com.dragonsoft.dcuc.approve.model.resp.*;
 import com.dragonsoft.dcuc.approve.model.vo.ApproveTaskRequestVo;
-import com.dragonsoft.dcuc.approve.model.vo.TaskRequestUserInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.TaskRequestUserInfoDTO;
 import com.dragonsoft.dcuc.approve.properties.ApproveProperties;
 import com.dragonsoft.dcuc.approve.service.IApproveCirculationService;
 import com.dragonsoft.dcuc.approve.service.IApproveRecordService;
-import com.dragonsoft.dcuc.approve.service.IApproveService;
+import com.dragonsoft.dcuc.approve.business.IApproveCommonBusiness;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.security.BaseSecurityUser;
@@ -45,7 +45,7 @@ import java.util.List;
 @RestController
 public class ApproveFacade implements IApproveFacade {
 
-    private IApproveService approveService;
+    private IApproveCommonBusiness approveService;
 
     private IWorkFlowBusiness workFlowBusiness;
 
@@ -65,7 +65,7 @@ public class ApproveFacade implements IApproveFacade {
     }
 
     @Autowired
-    public void setApproveService(IApproveService approveService) {
+    public void setApproveService(IApproveCommonBusiness approveService) {
         this.approveService = approveService;
     }
 
@@ -155,8 +155,8 @@ public class ApproveFacade implements IApproveFacade {
         }
         String flowType = approveRecordInfo.getFlowType();
         String applicantIdcard = approveRecordInfo.getApplicantIdcard();
-        ApprovalInfo approvalInfo = approveRecordInfo.toApprovalInfo();
-        ResourceInfoDTO resourceInfoVo = approvalInfo.getResourceInfoVo();
+        ApprovalInfoDTO approvalInfoDTO = approveRecordInfo.toApprovalInfo();
+        ResourceInfoDTO resourceInfoVo = approvalInfoDTO.getResourceInfoVo();
 
         FlowTypeEnum flowTypeEnum = EnumUtils.enumOf(FlowTypeEnum.class, flowType);
 

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

@@ -11,7 +11,7 @@ import com.dragoninfo.dcuc.common.utils.SearchableUtil;
 import com.dragonsoft.dcuc.approve.business.IApproveBusiness;
 import com.dragonsoft.dcuc.approve.business.IApproveUploadBusiness;
 import com.dragonsoft.dcuc.approve.business.IWorkFlowBusiness;
-import com.dragonsoft.dcuc.approve.dto.OperateReqDTO;
+import com.dragonsoft.dcuc.approve.model.dto.OperateReqDTO;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveWorkFlowOperationEnum;
 import com.dragonsoft.dcuc.approve.enumresources.PageTypeEnum;
 import com.dragonsoft.dcuc.approve.model.req.ApprovalInfoReqVO;
@@ -20,9 +20,9 @@ import com.dragonsoft.dcuc.approve.model.req.ApproveOperateReqVO;
 import com.dragonsoft.dcuc.approve.model.req.ApproveRecordReportReqVO;
 import com.dragonsoft.dcuc.approve.model.resp.*;
 import com.dragonsoft.dcuc.approve.model.vo.ApproveTaskRequestVo;
-import com.dragonsoft.dcuc.approve.model.vo.TaskRequestUserInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.TaskRequestUserInfoDTO;
 import com.dragonsoft.dcuc.approve.properties.ApproveProperties;
-import com.dragonsoft.dcuc.approve.service.IApproveService;
+import com.dragonsoft.dcuc.approve.business.IApproveCommonBusiness;
 import com.dragonsoft.dcuc.approve.threadlocal.ThreadLocalProofsHolder;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
@@ -50,7 +50,7 @@ import java.util.Map;
 @RestController
 public class ApiV1ApproveFacade implements IApiV1ApproveFacade {
     @Autowired
-    private IApproveService approveService;
+    private IApproveCommonBusiness approveService;
     @Autowired
     private IResourceFacade resourceFacade;
     @Autowired

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

@@ -11,18 +11,18 @@ import com.dragoninfo.dcuc.duceap.enums.ManageDisposeTypeEnum;
 import com.dragonsoft.dcuc.approve.business.IApproveBusiness;
 import com.dragonsoft.dcuc.approve.business.external.IDcucBusiness;
 import com.dragonsoft.dcuc.approve.business.IWorkFlowBusiness;
-import com.dragonsoft.dcuc.approve.dto.OperateReqDTO;
+import com.dragonsoft.dcuc.approve.model.dto.OperateReqDTO;
 import com.dragonsoft.dcuc.approve.enumresources.*;
-import com.dragonsoft.dcuc.approve.model.ApprovalInfo;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.dragonsoft.dcuc.approve.model.req.*;
 import com.dragonsoft.dcuc.approve.model.req.v2.ApproveOperateV2ReqVO;
 import com.dragonsoft.dcuc.approve.model.resp.*;
 import com.dragonsoft.dcuc.approve.model.vo.ApproveTaskRequestVo;
-import com.dragonsoft.dcuc.approve.model.vo.TaskRequestUserInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.TaskRequestUserInfoDTO;
 import com.dragonsoft.dcuc.approve.model.vo.dcuc.OauthUserVO;
 import com.dragonsoft.dcuc.approve.service.IApproveRecordService;
-import com.dragonsoft.dcuc.approve.service.IApproveService;
+import com.dragonsoft.dcuc.approve.business.IApproveCommonBusiness;
 import com.dragonsoft.dcuc.approve.threadlocal.ThreadLocalProofsHolder;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
@@ -57,7 +57,7 @@ import java.util.*;
 public class ApiV2ApproveFacade implements IApiV2ApproveFacade {
 
     @Autowired
-    private IApproveService approveService;
+    private IApproveCommonBusiness approveService;
 
     @Autowired
     private IApproveRecordService approveRecordService;
@@ -242,8 +242,8 @@ public class ApiV2ApproveFacade implements IApiV2ApproveFacade {
             return ResponseUtil.dtoFail("申请表单不存在");
         }
 
-        ApprovalInfo approvalInfo = approveRecordInfo.toApprovalInfo();
-        ApprovalInfoRespVO approvalInfoRespVO = approveBusiness.fillTaskInfoToApplyInfo(approvalInfo);
+        ApprovalInfoDTO approvalInfoDTO = approveRecordInfo.toApprovalInfo();
+        ApprovalInfoRespVO approvalInfoRespVO = approveBusiness.fillTaskInfoToApplyInfo(approvalInfoDTO);
 
         ApprovalInfoV2RespVO approvalInfoV2RespVO = new ApprovalInfoV2RespVO();
         BeanUtil.copyProperties(approvalInfoRespVO, approvalInfoV2RespVO);

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/facade/api/v3/ApiV3ApproveFacade.java

@@ -12,7 +12,7 @@ import com.dragonsoft.dcuc.approve.business.external.IBimBusiness;
 import com.dragonsoft.dcuc.approve.business.external.IDcucBusiness;
 import com.dragonsoft.dcuc.approve.business.IWorkFlowBusiness;
 import com.dragonsoft.dcuc.approve.business.api.IApiV3ApproveBusiness;
-import com.dragonsoft.dcuc.approve.dto.OperateReqDTO;
+import com.dragonsoft.dcuc.approve.model.dto.OperateReqDTO;
 import com.dragonsoft.dcuc.approve.enumresources.*;
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.dragonsoft.dcuc.approve.model.ApproveTaskClass;
@@ -27,11 +27,11 @@ import com.dragonsoft.dcuc.approve.model.resp.v3.ZeroTrustApproveCreateV3RespVO;
 import com.dragonsoft.dcuc.approve.model.resp.v3.ZeroTrustMessageRespVO;
 import com.dragonsoft.dcuc.approve.model.resp.v3.ZeroTrustResultDataVO;
 import com.dragonsoft.dcuc.approve.model.vo.ApproveTaskRequestVo;
-import com.dragonsoft.dcuc.approve.model.vo.TaskRequestUserInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.TaskRequestUserInfoDTO;
 import com.dragonsoft.dcuc.approve.model.vo.dcuc.ApiOrgResultVo;
 import com.dragonsoft.dcuc.approve.model.vo.dcuc.OauthUserVO;
 import com.dragonsoft.dcuc.approve.service.IApproveRecordService;
-import com.dragonsoft.dcuc.approve.service.IApproveService;
+import com.dragonsoft.dcuc.approve.business.IApproveCommonBusiness;
 import com.dragonsoft.dcuc.approve.service.IApproveTaskClassService;
 import com.dragonsoft.dcuc.approve.threadlocal.ThreadLocalProofsHolder;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
@@ -61,7 +61,7 @@ import java.util.Map;
 @RestController
 public class ApiV3ApproveFacade implements IApiV3ApproveFacade {
 
-    private IApproveService approveService;
+    private IApproveCommonBusiness approveService;
 
     private IApproveRecordService approveRecordService;
 
@@ -98,7 +98,7 @@ public class ApiV3ApproveFacade implements IApiV3ApproveFacade {
     }
 
     @Autowired
-    public void setApproveService(IApproveService approveService) {
+    public void setApproveService(IApproveCommonBusiness approveService) {
         this.approveService = approveService;
     }
 

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/mapper/ApprovalInfoMapper.java

@@ -1,6 +1,6 @@
 package com.dragonsoft.dcuc.approve.mapper;
 
-import com.dragonsoft.dcuc.approve.model.ApprovalInfo;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
 import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Mapper;
  * @desc 申请表单信息
  */
 @Mapper
-public interface ApprovalInfoMapper extends BaseMybatisMapper<ApprovalInfo> {
+public interface ApprovalInfoMapper extends BaseMybatisMapper<ApprovalInfoDTO> {
 }

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

@@ -3,7 +3,8 @@ package com.dragonsoft.dcuc.approve.model;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.*;
-import com.dragonsoft.dcuc.approve.dto.ResourceInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ResourceInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveResultEnum;
 import com.dragonsoft.dcuc.approve.enumresources.FlowTypeEnum;
 import com.dragonsoft.dcuc.approve.enumresources.PermissionValidTypeEnum;
@@ -312,18 +313,18 @@ public class ApproveRecordInfo {
      *
      * @return 旧表单对象
      */
-    public ApprovalInfo toApprovalInfo() {
-        ApprovalInfo approvalInfo = new ApprovalInfo();
-        BeanUtils.copyProperties(this, approvalInfo);
-        approvalInfo.setBusinessCode(this.getBusinessCode());
-        approvalInfo.setProcessInstanceId(this.getProcessInstanceId());
-        approvalInfo.setProcessTitle(this.getProcessTitle());
-        approvalInfo.setApplyReason(this.getApplyReason());
-        approvalInfo.setApplyContent(this.getApproveContent());
-        approvalInfo.setApproveTaskIdentifier(this.getTaskCode());
-        approvalInfo.setApproveResult(this.getFinalApprovalResult());
-        approvalInfo.setCallbackUrl(this.getCallbackUrl());
-        approvalInfo.setApproveTaskClass(this.getApproveTaskClass());
+    public ApprovalInfoDTO toApprovalInfo() {
+        ApprovalInfoDTO approvalInfoDTO = new ApprovalInfoDTO();
+        BeanUtils.copyProperties(this, approvalInfoDTO);
+        approvalInfoDTO.setBusinessCode(this.getBusinessCode());
+        approvalInfoDTO.setProcessInstanceId(this.getProcessInstanceId());
+        approvalInfoDTO.setProcessTitle(this.getProcessTitle());
+        approvalInfoDTO.setApplyReason(this.getApplyReason());
+        approvalInfoDTO.setApplyContent(this.getApproveContent());
+        approvalInfoDTO.setApproveTaskIdentifier(this.getTaskCode());
+        approvalInfoDTO.setApproveResult(this.getFinalApprovalResult());
+        approvalInfoDTO.setCallbackUrl(this.getCallbackUrl());
+        approvalInfoDTO.setApproveTaskClass(this.getApproveTaskClass());
 
         ResourceInfoDTO resourceInfoVo = new ResourceInfoDTO();
 
@@ -359,9 +360,9 @@ public class ApproveRecordInfo {
             resourceInfoVo.setDisagreeVisitResourceName(disagreeAccessResourcesMap.entrySet().stream().findFirst().get().getValue());
         }
 
-        approvalInfo.setResourceInfoVo(resourceInfoVo);
-        approvalInfo.setAppCode(this.getAppCode());
-        return approvalInfo;
+        approvalInfoDTO.setResourceInfoVo(resourceInfoVo);
+        approvalInfoDTO.setAppCode(this.getAppCode());
+        return approvalInfoDTO;
     }
 
 }

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/ApprovalInfo.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/ApprovalInfoDTO.java

@@ -1,9 +1,9 @@
-package com.dragonsoft.dcuc.approve.model;
+package com.dragonsoft.dcuc.approve.model.dto;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.dragonsoft.dcuc.approve.dto.ResourceInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveResultEnum;
 import com.dragonsoft.dcuc.approve.enumresources.FlowTypeEnum;
+import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,7 +21,7 @@ import java.util.Date;
  * @see ApproveRecordInfo
  */
 @Data
-public class ApprovalInfo implements Serializable {
+public class ApprovalInfoDTO implements Serializable {
 
     private static final long serialVersionUID = 5454155825318885342L;
 

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/vo/ApprovalInfoMsgItemDTO.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/ApprovalInfoMsgItemDTO.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.model.vo;
+package com.dragonsoft.dcuc.approve.model.dto;
 
 import com.dragonsoft.dcuc.approve.model.resp.ResourceInfoRespVO;
 import com.fasterxml.jackson.annotation.JsonFormat;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/dto/ApproveLogDTO.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/ApproveLogDTO.java

@@ -1,6 +1,5 @@
-package com.dragonsoft.dcuc.approve.dto;
+package com.dragonsoft.dcuc.approve.model.dto;
 
-import com.dragonsoft.dcuc.approve.model.vo.LogInfoMetaDTO;
 import lombok.Builder;
 import lombok.Data;
 

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/vo/ApproveMessageInfoDTO.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/ApproveMessageInfoDTO.java

@@ -1,10 +1,8 @@
-package com.dragonsoft.dcuc.approve.model.vo;
+package com.dragonsoft.dcuc.approve.model.dto;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Assert;
-import com.dragonsoft.dcuc.approve.dto.ResourceInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveWorkFlowOperationEnum;
-import com.dragonsoft.dcuc.approve.model.ApprovalInfo;
 import com.dragonsoft.duceap.base.entity.security.SecurityUser;
 import com.dragonsoft.duceap.base.utils.UserContextUtils;
 import lombok.Data;
@@ -63,7 +61,7 @@ public class ApproveMessageInfoDTO {
     /**
      * 审批单信息
      */
-    private ApprovalInfo approvalInfo;
+    private ApprovalInfoDTO approvalInfoDTO;
 
     /**
      * 审批人信息
@@ -71,20 +69,20 @@ public class ApproveMessageInfoDTO {
     private SecurityUser securityUser;
 
 
-    public static ApproveMessageInfoDTO newInstance(ApprovalInfo approvalInfo, ApproveWorkFlowOperationEnum approveResult, String approveMessage) {
-        Assert.notNull(approvalInfo);
+    public static ApproveMessageInfoDTO newInstance(ApprovalInfoDTO approvalInfoDTO, ApproveWorkFlowOperationEnum approveResult, String approveMessage) {
+        Assert.notNull(approvalInfoDTO);
         Assert.notNull(approveResult);
         SecurityUser currentUser = UserContextUtils.getCurrentUser();
 
-        String approveNo = approvalInfo.getApproveNo();
-        String appCode = approvalInfo.getAppCode();
-        String processInstanceId = approvalInfo.getProcessInstanceId();
-        String messageId = approvalInfo.getMessageId();
-        String callbackUrl = approvalInfo.getCallbackUrl();
+        String approveNo = approvalInfoDTO.getApproveNo();
+        String appCode = approvalInfoDTO.getAppCode();
+        String processInstanceId = approvalInfoDTO.getProcessInstanceId();
+        String messageId = approvalInfoDTO.getMessageId();
+        String callbackUrl = approvalInfoDTO.getCallbackUrl();
 
         ApprovalInfoMsgItemDTO approvalInfoMsgItemDTO = new ApprovalInfoMsgItemDTO();
-        BeanUtil.copyProperties(approvalInfo, approvalInfoMsgItemDTO);
-        ResourceInfoDTO resourceInfoVo = approvalInfo.getResourceInfoVo();
+        BeanUtil.copyProperties(approvalInfoDTO, approvalInfoMsgItemDTO);
+        ResourceInfoDTO resourceInfoVo = approvalInfoDTO.getResourceInfoVo();
         approvalInfoMsgItemDTO.setResourceInfo(resourceInfoVo.toResourceInfoRespVO());
 
         ApproveMessageInfoDTO approveMessageInfoDTO = new ApproveMessageInfoDTO();
@@ -96,7 +94,7 @@ public class ApproveMessageInfoDTO {
         approveMessageInfoDTO.setApproveResult(approveResult);
         approveMessageInfoDTO.setApproveMessage(approveMessage);
         approveMessageInfoDTO.setCallbackUrl(callbackUrl);
-        approveMessageInfoDTO.setApprovalInfo(approvalInfo);
+        approveMessageInfoDTO.setApprovalInfoDTO(approvalInfoDTO);
         approveMessageInfoDTO.setSecurityUser(currentUser);
 
         return approveMessageInfoDTO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/dto/BaseOperateReqDTO.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/BaseOperateReqDTO.java

@@ -1,9 +1,7 @@
-package com.dragonsoft.dcuc.approve.dto;
+package com.dragonsoft.dcuc.approve.model.dto;
 
 import com.dragonsoft.dcuc.approve.enumresources.ApproveWorkFlowOperationEnum;
-import com.dragonsoft.dcuc.approve.model.ApprovalInfo;
 import com.dragonsoft.dcuc.approve.model.vo.ApproveTaskRequestVo;
-import com.dragonsoft.dcuc.approve.model.vo.TaskRequestUserInfoDTO;
 import com.dragonsoft.duceap.duwf.api.model.TaskRequest;
 import lombok.Builder;
 import lombok.Data;
@@ -38,7 +36,7 @@ public class BaseOperateReqDTO {
     /**
      * 审批信息
      */
-    private ApprovalInfo approvalInfo;
+    private ApprovalInfoDTO approvalInfoDTO;
     /**
      * 请求人信息
      */

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/dto/ContentRespDTO.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/ContentRespDTO.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.dto;
+package com.dragonsoft.dcuc.approve.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/vo/LogDto.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/LogDto.java

@@ -1,7 +1,7 @@
-package com.dragonsoft.dcuc.approve.model.vo;
+package com.dragonsoft.dcuc.approve.model.dto;
 
 import com.dragonsoft.dcuc.approve.enumresources.ApproveResultEnum;
-import com.dragonsoft.dcuc.approve.model.ApprovalInfo;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
 import com.dragonsoft.dcuc.approve.model.resp.OperateRespVO;
 import com.dragonsoft.duceap.duwf.api.model.ProcessInstanceVO;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -24,7 +24,7 @@ public class LogDto implements Serializable {
 
     private static final long serialVersionUID = 5454155825318885342L;
     @ApiModelProperty(value = "表单信息")
-    private ApprovalInfo approvalInfo;
+    private ApprovalInfoDTO approvalInfoDTO;
 
     @ApiModelProperty(value = "节点Vo")
     private ProcessInstanceVO processInstanceVO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/vo/LogInfoMetaDTO.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/LogInfoMetaDTO.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.model.vo;
+package com.dragonsoft.dcuc.approve.model.dto;
 
 import lombok.Data;
 

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/dto/OperateReqDTO.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/OperateReqDTO.java

@@ -1,8 +1,7 @@
-package com.dragonsoft.dcuc.approve.dto;
+package com.dragonsoft.dcuc.approve.model.dto;
 
 import com.dragonsoft.dcuc.approve.enumresources.ApproveWorkFlowOperationEnum;
 import com.dragonsoft.dcuc.approve.model.vo.ApproveTaskRequestVo;
-import com.dragonsoft.dcuc.approve.model.vo.TaskRequestUserInfoDTO;
 import com.dragonsoft.duceap.duwf.api.model.ActivitiHolder;
 import com.dragonsoft.duceap.duwf.api.model.TaskRequest;
 import lombok.Builder;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/vo/ProcessInstanceInfoDTO.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/ProcessInstanceInfoDTO.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.model.vo;
+package com.dragonsoft.dcuc.approve.model.dto;
 
 import com.dragonsoft.duceap.duwf.api.model.ProcessInstanceVO;
 import com.dragonsoft.duceap.duwf.api.model.TaskHistoryDetailVo;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/vo/QmOperateLogDTO.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/QmOperateLogDTO.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.model.vo;
+package com.dragonsoft.dcuc.approve.model.dto;
 
 import com.dragoninfo.dcuc.duceap.enums.OperateDisposeTypeEnum;
 import com.dragonsoft.dcuc.approve.enumresources.QmApproveTypeEnum;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/dto/ResourceInfoDTO.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/ResourceInfoDTO.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.dto;
+package com.dragonsoft.dcuc.approve.model.dto;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.dragonsoft.dcuc.approve.model.req.ResourceInfoReqVO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/dto/RzyRiskLogDTO.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/RzyRiskLogDTO.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.dto;
+package com.dragonsoft.dcuc.approve.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Builder;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/vo/TaskRequestUserInfoDTO.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/TaskRequestUserInfoDTO.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.model.vo;
+package com.dragonsoft.dcuc.approve.model.dto;
 
 import com.dragonsoft.duceap.base.entity.security.BaseSecurityUser;
 import lombok.Data;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/dto/zerotrust/AppTokenInfoDTO.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/zerotrust/AppTokenInfoDTO.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.dto.zerotrust;
+package com.dragonsoft.dcuc.approve.model.dto.zerotrust;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/dto/zerotrust/UserTokenInfoDTO.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/zerotrust/UserTokenInfoDTO.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.dto.zerotrust;
+package com.dragonsoft.dcuc.approve.model.dto.zerotrust;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

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

@@ -1,7 +1,6 @@
 package com.dragonsoft.dcuc.approve.service;
 
-import cn.hutool.core.date.DateTime;
-import com.dragonsoft.dcuc.approve.model.ApprovalInfo;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.dragonsoft.dcuc.approve.model.resp.ApprovalInfoRespVO;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
@@ -93,11 +92,11 @@ public interface IApproveRecordService {
     /**
      * 将旧表单表对象构建成模式3新表对象
      *
-     * @param approvalInfo 审批信息
+     * @param approvalInfoDTO 审批信息
      * @param approveNo    审批单号
      * @return 审批记录信息
      */
-    ApproveRecordInfo buildApproveRecordInfo(ApprovalInfo approvalInfo, String approveNo);
+    ApproveRecordInfo buildApproveRecordInfo(ApprovalInfoDTO approvalInfoDTO, String approveNo);
 
     /**
      * 我的请求列表

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

@@ -11,12 +11,12 @@ import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 import com.dragoninfo.dcuc.app.facade.IApplyInfoFacade;
 import com.dragonsoft.dcuc.approve.business.IApproveBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
-import com.dragonsoft.dcuc.approve.dto.ResourceInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ResourceInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveResultEnum;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveTypeEnum;
 import com.dragonsoft.dcuc.approve.enumresources.FlowTypeEnum;
 import com.dragonsoft.dcuc.approve.mapper.ApproveRecordMapper;
-import com.dragonsoft.dcuc.approve.model.ApprovalInfo;
+import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.dragonsoft.dcuc.approve.model.resp.ApprovalInfoRespVO;
 import com.dragonsoft.dcuc.approve.service.IApproveRecordService;
@@ -163,36 +163,36 @@ public class ApproveRecordServiceImpl implements IApproveRecordService {
     /**
      * 将旧表单表对象构建成模式3新表对象
      *
-     * @param approvalInfo 审批信息
+     * @param approvalInfoDTO 审批信息
      * @param approveNo    审批单号
      * @return 审批记录信息
      */
     @Override
-    public ApproveRecordInfo buildApproveRecordInfo(ApprovalInfo approvalInfo, String approveNo) {
+    public ApproveRecordInfo buildApproveRecordInfo(ApprovalInfoDTO approvalInfoDTO, String approveNo) {
         ApproveRecordInfo approveRecordInfo = new ApproveRecordInfo();
-        approveRecordInfo.setId(approvalInfo.getId());
-        approveRecordInfo.setBusinessCode(approvalInfo.getBusinessCode());
-        approveRecordInfo.setProcessName(approvalInfo.getProcessName());
+        approveRecordInfo.setId(approvalInfoDTO.getId());
+        approveRecordInfo.setBusinessCode(approvalInfoDTO.getBusinessCode());
+        approveRecordInfo.setProcessName(approvalInfoDTO.getProcessName());
 
-        approveRecordInfo.setProcessType(approvalInfo.getProcessType());
-        approveRecordInfo.setProcessTypeName(approvalInfo.getProcessTypeName());
+        approveRecordInfo.setProcessType(approvalInfoDTO.getProcessType());
+        approveRecordInfo.setProcessTypeName(approvalInfoDTO.getProcessTypeName());
 
-        String flowType = approvalInfo.getFlowType();
+        String flowType = approvalInfoDTO.getFlowType();
         FlowTypeEnum flowTypeEnum = EnumUtils.enumOf(FlowTypeEnum.class, flowType);
         ApproveTypeEnum approveTypeEnum = flowTypeEnum.toApproveTypeEnum();
         //审批中心类型
         approveRecordInfo.setApproveType(approveTypeEnum.value);
         //审批单号规则
         approveRecordInfo.setApproveNo(approveNo);
-        approveRecordInfo.setProcessTitle(approvalInfo.getProcessTitle());
-        approveRecordInfo.setApplicantIdcard(approvalInfo.getApplicantIdcard());
-        approveRecordInfo.setApplicantName(approvalInfo.getApplicantName());
-        approveRecordInfo.setApplicantPhoneNo(approvalInfo.getApplicantPhoneNo());
-        approveRecordInfo.setApplicantOrgCode(approvalInfo.getApplicantOrgCode());
-        approveRecordInfo.setApplicantOrgName(approvalInfo.getApplicantOrgName());
-        approveRecordInfo.setApplyTime(DateUtils.getTimeStr(approvalInfo.getCreateTime(), DateConst.HYPHEN_DISPLAY_TIME));
-
-        String appCode = approvalInfo.getAppCode();
+        approveRecordInfo.setProcessTitle(approvalInfoDTO.getProcessTitle());
+        approveRecordInfo.setApplicantIdcard(approvalInfoDTO.getApplicantIdcard());
+        approveRecordInfo.setApplicantName(approvalInfoDTO.getApplicantName());
+        approveRecordInfo.setApplicantPhoneNo(approvalInfoDTO.getApplicantPhoneNo());
+        approveRecordInfo.setApplicantOrgCode(approvalInfoDTO.getApplicantOrgCode());
+        approveRecordInfo.setApplicantOrgName(approvalInfoDTO.getApplicantOrgName());
+        approveRecordInfo.setApplyTime(DateUtils.getTimeStr(approvalInfoDTO.getCreateTime(), DateConst.HYPHEN_DISPLAY_TIME));
+
+        String appCode = approvalInfoDTO.getAppCode();
         if (StrUtil.isBlank(appCode)) {
             throw new IllegalArgumentException("appCode can't be blank");
         }
@@ -206,32 +206,32 @@ public class ApproveRecordServiceImpl implements IApproveRecordService {
         } catch (Exception e) {
             log.error("调用app-service失败", e);
         }
-        ResourceInfoDTO resourceInfoVo = approvalInfo.getResourceInfoVo();
-        approveRecordInfo.setApproveContent(approvalInfo.getApplyContent());
+        ResourceInfoDTO resourceInfoVo = approvalInfoDTO.getResourceInfoVo();
+        approveRecordInfo.setApproveContent(approvalInfoDTO.getApplyContent());
 
         approveBusiness.setResourceInfoData(approveRecordInfo, resourceInfoVo);
 
-        approveRecordInfo.setPermissionValidType(approvalInfo.getPermissionValidType());
-        approveRecordInfo.setStartTime(approvalInfo.getStartTime());
-        approveRecordInfo.setEndTime(approvalInfo.getEndTime());
-        approveRecordInfo.setApplyReason(approvalInfo.getApplyReason());
+        approveRecordInfo.setPermissionValidType(approvalInfoDTO.getPermissionValidType());
+        approveRecordInfo.setStartTime(approvalInfoDTO.getStartTime());
+        approveRecordInfo.setEndTime(approvalInfoDTO.getEndTime());
+        approveRecordInfo.setApplyReason(approvalInfoDTO.getApplyReason());
         approveRecordInfo.setFinalApprovalResult("");
-        approveRecordInfo.setProcessInstanceId(approvalInfo.getProcessInstanceId());
-        approveRecordInfo.setTaskCode(approvalInfo.getBusinessCode());
-        approveRecordInfo.setTaskId(approvalInfo.getTaskId());
-        approveRecordInfo.setTaskName(approvalInfo.getTaskName());
-        approveRecordInfo.setMessageId(approvalInfo.getMessageId());
-        approveRecordInfo.setOtherApplyContext(approvalInfo.getApplyContent());
+        approveRecordInfo.setProcessInstanceId(approvalInfoDTO.getProcessInstanceId());
+        approveRecordInfo.setTaskCode(approvalInfoDTO.getBusinessCode());
+        approveRecordInfo.setTaskId(approvalInfoDTO.getTaskId());
+        approveRecordInfo.setTaskName(approvalInfoDTO.getTaskName());
+        approveRecordInfo.setMessageId(approvalInfoDTO.getMessageId());
+        approveRecordInfo.setOtherApplyContext(approvalInfoDTO.getApplyContent());
         approveRecordInfo.setIsDeleted(BooleanEnum.FALSE.getValue());
-        approveRecordInfo.setCreateUser(approvalInfo.getCreateUser());
-        approveRecordInfo.setCreateTime(approvalInfo.getCreateTime());
-        approveRecordInfo.setUpdateUser(approvalInfo.getUpdateUser());
-        approveRecordInfo.setUpdateTime(approvalInfo.getUpdateTime());
-        approveRecordInfo.setFlowType(approvalInfo.getFlowType());
-        approveRecordInfo.setCallbackUrl(approvalInfo.getCallbackUrl());
-        approveRecordInfo.setApproveTaskClass(approvalInfo.getApproveTaskClass());
-        approveRecordInfo.setApplicantIp(approvalInfo.getApplicantIp());
-        approveRecordInfo.setApplicantAppToken(approvalInfo.getApplicantAppToken());
+        approveRecordInfo.setCreateUser(approvalInfoDTO.getCreateUser());
+        approveRecordInfo.setCreateTime(approvalInfoDTO.getCreateTime());
+        approveRecordInfo.setUpdateUser(approvalInfoDTO.getUpdateUser());
+        approveRecordInfo.setUpdateTime(approvalInfoDTO.getUpdateTime());
+        approveRecordInfo.setFlowType(approvalInfoDTO.getFlowType());
+        approveRecordInfo.setCallbackUrl(approvalInfoDTO.getCallbackUrl());
+        approveRecordInfo.setApproveTaskClass(approvalInfoDTO.getApproveTaskClass());
+        approveRecordInfo.setApplicantIp(approvalInfoDTO.getApplicantIp());
+        approveRecordInfo.setApplicantAppToken(approvalInfoDTO.getApplicantAppToken());
         approveRecordInfo.setSyncFlag(BooleanEnum.FALSE.value);
         return approveRecordInfo;
     }
@@ -247,9 +247,9 @@ public class ApproveRecordServiceImpl implements IApproveRecordService {
         List<ApproveRecordInfo> content = applyInfoPage.getContent();
         for (ApproveRecordInfo approveRecordInfo : content) {
             //将模式3新表对象构建成旧表对象（前端和运营中心无需改造）
-            ApprovalInfo approvalInfo = approveRecordInfo.toApprovalInfo();
+            ApprovalInfoDTO approvalInfoDTO = approveRecordInfo.toApprovalInfo();
             //设置当前结点和未操作者信息
-            ApprovalInfoRespVO approvalInfoRespVo = approveBusiness.fillTaskInfoToApplyInfo(approvalInfo);
+            ApprovalInfoRespVO approvalInfoRespVo = approveBusiness.fillTaskInfoToApplyInfo(approvalInfoDTO);
             approvalInfoRespVo.setAppCode(approveRecordInfo.getAppCode());
             approvalInfoRespVo.setBusinessId(approvalInfoRespVo.getId());
             approvalInfoRespVOList.add(approvalInfoRespVo);

approve-core-service/src/test/java/com/dragonsoft/dcuc/approve/business/external/impl/DcucAuthBusinessImplTest.java

@@ -1,7 +1,6 @@
 package com.dragonsoft.dcuc.approve.business.external.impl;
 
-import com.dragonsoft.dcuc.approve.business.external.impl.DcucAuthBusinessImpl;
-import com.dragonsoft.dcuc.approve.dto.ResourceInfoDTO;
+import com.dragonsoft.dcuc.approve.model.dto.ResourceInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.FlowTypeEnum;
 import com.dragonsoft.dcuc.approve.enumresources.ListLevelEnum;
 import com.dragonsoft.dcuc.approve.model.resp.OperateRespVO;

approve-core-service/src/test/java/com/dragonsoft/dcuc/approve/facade/api/ApiV3ApproveFacadeTest.java

@@ -9,7 +9,7 @@ import com.dragonsoft.dcuc.approve.model.req.v3.ZeroTrustApproveCreateReqV3VO;
 import com.dragonsoft.dcuc.approve.model.resp.bim.ZeroTrustAppTokenInfoRespVO;
 import com.dragonsoft.dcuc.approve.model.resp.v3.ZeroTrustApproveCreateV3RespVO;
 import com.dragonsoft.dcuc.approve.model.resp.v3.ZeroTrustResultDataVO;
-import com.dragonsoft.dcuc.approve.service.IApproveService;
+import com.dragonsoft.dcuc.approve.business.IApproveCommonBusiness;
 import com.dragonsoft.duceap.commons.util.UUIDUtils;
 import com.dragonsoft.duceap.duwf.api.model.WorkflowProcessVo;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -46,7 +46,7 @@ public class ApiV3ApproveFacadeTest {
 
         approveRecordInfo.setProcessInstanceId(processInsId);
 
-        IApproveService approveService = Mockito.spy(IApproveService.class);
+        IApproveCommonBusiness approveService = Mockito.spy(IApproveCommonBusiness.class);
         Mockito.when(approveService.saveBase(Mockito.any(), Mockito.any(), Mockito.any()))
                 .thenReturn(approveRecordInfo);