feat: 增加刷新不同意资源内容

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

@@ -6,6 +6,7 @@ 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.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;
@@ -141,4 +142,12 @@ public interface IApproveBusiness {
      * @param approvalInfo 审批信息
      */
     void buildTaskInfoByProcessInstanceId(ApprovalInfo approvalInfo, List<TaskHistoryDetailVo> list);
+
+    /**
+     * 设置资源信息
+     *
+     * @param approveRecordInfo 审批记录表
+     * @param resourceInfoDTO   资源信息
+     */
+    void setResourceInfoData(ApproveRecordInfo approveRecordInfo, ResourceInfoDTO resourceInfoDTO);
 }

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

@@ -779,4 +779,33 @@ public class ApproveBusinessImpl implements IApproveBusiness {
         approvalInfo.setUpdateTime(new Date());
         approvalInfo.setUpdateUser(ProofsUtil.getIdcard());
     }
+
+
+    @Override
+    public void setResourceInfoData(ApproveRecordInfo approveRecordInfo, ResourceInfoDTO resourceInfoDTO) {
+        Map<String, String> accessResources = new HashMap<>(1);
+        accessResources.put(resourceInfoDTO.getVisitorName(), resourceInfoDTO.getVisitResourceName());
+        approveRecordInfo.setAccessResources(JSON.toJSONString(accessResources));
+
+        Map<String, String> accessResourcesNo = new HashMap<>(1);
+        accessResourcesNo.put(resourceInfoDTO.getVisitorCode(), resourceInfoDTO.getVisitResourceCode());
+        approveRecordInfo.setAccessResourcesNo(JSON.toJSONString(accessResourcesNo));
+
+        Map<String, String> removeAccessResourcesNo = new HashMap<>(1);
+        removeAccessResourcesNo.put(resourceInfoDTO.getVisitorCode(), resourceInfoDTO.getRemoveVisitResourceCode());
+        approveRecordInfo.setRemoveAccessResourcesNo(JSON.toJSONString(removeAccessResourcesNo));
+
+        Map<String, String> removeAccessResources = new HashMap<>(1);
+        removeAccessResources.put(resourceInfoDTO.getVisitorName(), resourceInfoDTO.getRemoveVisitResourceName());
+        approveRecordInfo.setRemoveAccessResources(JSON.toJSONString(removeAccessResources));
+
+        Map<String, String> disagreeAccessResources = new HashMap<>(1);
+        disagreeAccessResources.put(resourceInfoDTO.getVisitorName(), resourceInfoDTO.getDisagreeVisitResourceName());
+        approveRecordInfo.setDisagreeAccessResources(JSON.toJSONString(disagreeAccessResources));
+
+        Map<String, String> disagreeAccessResourcesNo = new HashMap<>(1);
+        disagreeAccessResourcesNo.put(resourceInfoDTO.getVisitorCode(), resourceInfoDTO.getDisagreeVisitResourceCode());
+        approveRecordInfo.setDisagreeAccessResourcesNo(JSON.toJSONString(disagreeAccessResourcesNo));
+
+    }
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -7,7 +8,6 @@ import com.dragonsoft.dcuc.approve.enumresources.ApproveResultEnum;
 import com.dragonsoft.dcuc.approve.enumresources.FlowTypeEnum;
 import com.dragonsoft.dcuc.approve.enumresources.PermissionValidTypeEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.springframework.beans.BeanUtils;
@@ -134,6 +134,16 @@ public class ApproveRecordInfo {
      */
     private String removeAccessResourcesNo;
 
+    /**
+     * 不同意访问资源
+     */
+    private String disagreeAccessResources;
+
+    /**
+     * 不同意访问资源编号
+     */
+    private String disagreeAccessResourcesNo;
+
 
     /**
      * @see PermissionValidTypeEnum
@@ -173,19 +183,29 @@ public class ApproveRecordInfo {
      */
     private String attachmentUrl;
 
-    @ApiModelProperty(value = "流程实例ID")
+    /**
+     * 流程实例ID
+     */
     private String processInstanceId;
 
-    @ApiModelProperty(value = "任务标识(Code)")
+    /**
+     * 任务标识(Code)
+     */
     private String taskCode;
 
-    @ApiModelProperty(value = "任务ID")
+    /**
+     * 任务ID
+     */
     private String taskId;
 
-    @ApiModelProperty(value = "任务名称")
+    /**
+     * 任务名称
+     */
     private String taskName;
 
-    @ApiModelProperty(value = "消息ID")
+    /**
+     * 消息ID
+     */
     private String messageId;
 
     /**
@@ -287,6 +307,17 @@ public class ApproveRecordInfo {
             resourceInfoVo.setVisitorName(removeNameMap.entrySet().stream().findFirst().get().getKey());
             resourceInfoVo.setRemoveVisitResourceName(removeNameMap.entrySet().stream().findFirst().get().getValue());
         }
+
+        Map<String, String> disagreeAccessResourcesNoMap = (Map) JSON.parse(this.getDisagreeAccessResourcesNo());
+        if (CollUtil.isNotEmpty(disagreeAccessResourcesNoMap)) {
+            resourceInfoVo.setDisagreeVisitResourceCode(disagreeAccessResourcesNoMap.entrySet().stream().findFirst().get().getValue());
+        }
+
+        Map<String, String> disagreeAccessResourcesMap = (Map) JSON.parse(this.getDisagreeAccessResources());
+        if (CollUtil.isNotEmpty(disagreeAccessResourcesMap)) {
+            resourceInfoVo.setDisagreeVisitResourceName(disagreeAccessResourcesMap.entrySet().stream().findFirst().get().getValue());
+        }
+
         approvalInfo.setResourceInfoVo(resourceInfoVo);
         approvalInfo.setAppCode(this.getAppCode());
         return approvalInfo;

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

@@ -191,21 +191,8 @@ public class ApproveRecordServiceImpl implements IApproveRecordService {
         }
         ResourceInfoDTO resourceInfoVo = approvalInfo.getResourceInfoVo();
         approveRecordInfo.setApproveContent(approvalInfo.getApplyContent());
-        Map<String, String> accessResources = new HashMap<>(1);
-        accessResources.put(resourceInfoVo.getVisitorName(), resourceInfoVo.getVisitResourceName());
-        approveRecordInfo.setAccessResources(JSON.toJSONString(accessResources));
 
-        Map<String, String> accessResourcesNo = new HashMap<>();
-        accessResourcesNo.put(resourceInfoVo.getVisitorCode(), resourceInfoVo.getVisitResourceCode());
-        approveRecordInfo.setAccessResourcesNo(JSON.toJSONString(accessResourcesNo));
-
-        Map<String, String> removeAccessResourcesNo = new HashMap<>();
-        removeAccessResourcesNo.put(resourceInfoVo.getVisitorCode(), resourceInfoVo.getRemoveVisitResourceCode());
-        approveRecordInfo.setRemoveAccessResourcesNo(JSON.toJSONString(removeAccessResourcesNo));
-
-        Map<String, String> removeAccessResources = new HashMap<>();
-        removeAccessResources.put(resourceInfoVo.getVisitorName(), resourceInfoVo.getRemoveVisitResourceName());
-        approveRecordInfo.setRemoveAccessResources(JSON.toJSONString(removeAccessResources));
+        approveBusiness.setResourceInfoData(approveRecordInfo, resourceInfoVo);
 
         approveRecordInfo.setPermissionValidType(approvalInfo.getPermissionValidType());
         approveRecordInfo.setStartTime(approvalInfo.getStartTime());
@@ -259,4 +246,6 @@ public class ApproveRecordServiceImpl implements IApproveRecordService {
 
         return approveRecordMapper.selectOne(where);
     }
+
+
 }

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

@@ -685,6 +685,10 @@ public class ApproveServiceImpl implements IApproveService {
         approveRecordInfo.setAlreadyRedListApprove(approvalInfo.getAlreadyRedListApprove());
         approveRecordInfo.setUpdateTime(new Date());
         approveRecordInfo.setUpdateUser(ProofsUtil.getIdcard());
+
+        ResourceInfoDTO resourceInfoVo = approvalInfo.getResourceInfoVo();
+        approveBusiness.setResourceInfoData(approveRecordInfo, resourceInfoVo);
+
     }
 
     /**

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

@@ -0,0 +1,5 @@
+ALTER TABLE `T_APPROVE_RECORD_INFO`
+    ADD COLUMN `DISAGREE_ACCESS_RESOURCES` varchar(2048) NULL COMMENT '不同意访问资源' AFTER `REMOVE_ACCESS_RESOURCES_NO`;
+
+ALTER TABLE `T_APPROVE_RECORD_INFO`
+    ADD COLUMN `DISAGREE_ACCESS_RESOURCES_NO` varchar(2048) NULL COMMENT '不同意访问资源编号' AFTER `DISAGREE_ACCESS_RESOURCES`;