feat: 增加存储申请业务数据

approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/req/ApprovalInfoReqVO.java

@@ -141,4 +141,7 @@ public class ApprovalInfoReqVO implements Serializable {
     @ApiModelProperty(value = "申请人应用令牌")
     private String applicantAppToken;
 
+    @ApiModelProperty(value = "申请业务数据")
+    private String otherApplyContext;
+
 }

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

@@ -14,25 +14,18 @@ import com.dragoninfo.dcuc.duceap.enums.ManageDisposeTypeEnum;
 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.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.dto.ApprovalInfoDTO;
 import com.dragonsoft.dcuc.approve.model.ApproveCirculationInfo;
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.dragonsoft.dcuc.approve.model.TaskAssignRecord;
+import com.dragonsoft.dcuc.approve.model.dto.*;
 import com.dragonsoft.dcuc.approve.model.req.AgentReqVO;
 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.dto.ApproveMessageInfoDTO;
 import com.dragonsoft.dcuc.approve.model.vo.ApproveTaskRequestVo;
-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;
@@ -220,7 +213,7 @@ public class ApproveCommonBusinessImpl implements IApproveCommonBusiness {
             if (StrUtil.isBlank(applyContent)) {
                 String flowType = approvalInfoDTO.getFlowType();
                 FlowTypeEnum flowTypeEnum = EnumUtils.enumOf(FlowTypeEnum.class, flowType);
-                @Valid @NotNull ResourceInfoReqVO resourceInfoReqVO = approvalInfoReqVO.getResourceInfoDTO();
+                ResourceInfoReqVO resourceInfoReqVO = approvalInfoReqVO.getResourceInfoDTO();
                 ResourceInfoDTO resourceInfoDTO = ResourceInfoDTO.parseResourceInfoReqVO(resourceInfoReqVO);
                 ContentRespDTO contentRespDTO = approveBusiness.generalContentRespVO(flowTypeEnum, resourceInfoDTO);
                 approvalInfoDTO.setApplyContent(JSON.toJSONString(contentRespDTO));
@@ -235,7 +228,7 @@ public class ApproveCommonBusinessImpl implements IApproveCommonBusiness {
             }
 
             //判断是否需要提交，创建流程
-            @NotBlank String operateType = approvalInfoReqVO.getOperateType();
+            String operateType = approvalInfoReqVO.getOperateType();
             CommitTypeEnum commitTypeEnum = EnumUtils.enumOf(CommitTypeEnum.class, operateType);
             if (CommitTypeEnum.APPLY_COMMIT.equals(commitTypeEnum)) {
                 //创建流程
@@ -265,7 +258,7 @@ public class ApproveCommonBusinessImpl implements IApproveCommonBusiness {
                 taskRequestUserInfoDTO.setIdCard(approvalInfoReqVO.getApplicantIdcard());
                 taskRequestUserInfoDTO.setUserName(approvalInfoReqVO.getApplicantName());
                 String applicantIdcard = approvalInfoReqVO.getApplicantIdcard();
-                @Valid @NotNull ResourceInfoReqVO resourceInfoReqVO = approvalInfoReqVO.getResourceInfoDTO();
+                ResourceInfoReqVO resourceInfoReqVO = approvalInfoReqVO.getResourceInfoDTO();
                 FlowTypeEnum flowTypeEnum = EnumUtils.enumOf(FlowTypeEnum.class, flowType);
                 ResourceInfoDTO resourceInfoDTO = ResourceInfoDTO.parseResourceInfoReqVO(resourceInfoReqVO);
                 OperateRespVO operateRespVO = dcucAuthBusiness.checkHitRedList(applicantIdcard, flowTypeEnum, resourceInfoDTO);
@@ -510,7 +503,7 @@ public class ApproveCommonBusinessImpl implements IApproveCommonBusiness {
      * 构建工作流请求体
      *
      * @param taskRequest            任务请求
-     * @param approvalInfoDTO           审批信息
+     * @param approvalInfoDTO        审批信息
      * @param taskRequestUserInfoDTO 用户数据
      * @param activitiHolderList     任务信息
      * @param taskId                 任务id，新增时需要手动传（因为新增的时候没有任务id可以查询）
@@ -744,7 +737,7 @@ public class ApproveCommonBusinessImpl implements IApproveCommonBusiness {
      * 设置字段值
      *
      * @param approveRecordInfo 审批记录信息
-     * @param approvalInfoDTO      审批信息
+     * @param approvalInfoDTO   审批信息
      */
     private void buildUpdateInfo(ApproveRecordInfo approveRecordInfo, ApprovalInfoDTO approvalInfoDTO) {
         approveRecordInfo.setTaskName(approvalInfoDTO.getTaskName());
@@ -1194,7 +1187,7 @@ public class ApproveCommonBusinessImpl implements IApproveCommonBusiness {
      * 发送消息
      *
      * @param approveWorkFlowOperationEnum 操作类型
-     * @param approvalInfoDTO                 审批信息
+     * @param approvalInfoDTO              审批信息
      */
     protected void sendMessage(ApproveWorkFlowOperationEnum approveWorkFlowOperationEnum, ApprovalInfoDTO approvalInfoDTO, String approveMessage) {
         //构建消息体并发送

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

@@ -195,6 +195,10 @@ public class ApiV3ApproveFacade implements IApiV3ApproveFacade {
         if (MapUtil.isNotEmpty(bizData)) {
             BeanUtil.copyProperties(bizData, resourceInfoReqVO);
         }
+        String otherApplyContext = "";
+        if (MapUtil.isNotEmpty(bizData)) {
+            otherApplyContext = JsonUtils.toJSONString(bizData);
+        }
 
         Date startTime = apiV3ApproveBusiness.getBizData(bizData, ReqBizDataEnum.BIZ_TERM_START);
         Date startEnd = apiV3ApproveBusiness.getBizData(bizData, ReqBizDataEnum.BIZ_TERM_END);
@@ -211,7 +215,7 @@ public class ApiV3ApproveFacade implements IApiV3ApproveFacade {
         approvalInfoReqVO.setApplicantOrgCode(orgCode);
         approvalInfoReqVO.setApplicantOrgName(applicantOrgName);
         approvalInfoReqVO.setApplicantPhoneNo(applicantPhoneNo);
-        approvalInfoReqVO.setPermissionValidType(PermissionValidTypeEnum.LONG.getValue());
+        approvalInfoReqVO.setPermissionValidType(PermissionValidTypeEnum.CUSTOM.getValue());
         approvalInfoReqVO.setOperateType(CommitTypeEnum.APPLY_COMMIT.getValue());
         approvalInfoReqVO.setResourceInfoDTO(resourceInfoReqVO);
         approvalInfoReqVO.setCallbackUrl(callbackUrl);
@@ -222,6 +226,7 @@ public class ApiV3ApproveFacade implements IApiV3ApproveFacade {
         approvalInfoReqVO.setApplicantAppToken(appTokenId);
         approvalInfoReqVO.setStartTime(startTime);
         approvalInfoReqVO.setEndTime(startEnd);
+        approvalInfoReqVO.setOtherApplyContext(otherApplyContext);
 
         ApproveRecordInfo approveRecordInfo = approveService.saveBase(approvalInfoReqVO, ManageDisposeTypeEnum.INSERT, new Date());
         String processInstanceId = approveRecordInfo.getProcessInstanceId();

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

@@ -225,4 +225,7 @@ public class ApprovalInfoDTO implements Serializable {
     @ApiModelProperty(value = "访问资源信息")
     private ResourceInfoDTO resourceInfoVo;
 
+    @ApiModelProperty(value = "申请业务数据")
+    private String otherApplyContext;
+
 }

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

@@ -221,7 +221,7 @@ public class ApproveRecordServiceImpl implements IApproveRecordService {
         approveRecordInfo.setTaskId(approvalInfoDTO.getTaskId());
         approveRecordInfo.setTaskName(approvalInfoDTO.getTaskName());
         approveRecordInfo.setMessageId(approvalInfoDTO.getMessageId());
-        approveRecordInfo.setOtherApplyContext(approvalInfoDTO.getApplyContent());
+        approveRecordInfo.setOtherApplyContext(approvalInfoDTO.getOtherApplyContext());
         approveRecordInfo.setIsDeleted(BooleanEnum.FALSE.getValue());
         approveRecordInfo.setCreateUser(approvalInfoDTO.getCreateUser());
         approveRecordInfo.setCreateTime(approvalInfoDTO.getCreateTime());