采购资信：评审资料变更完善

@@ -117,6 +117,20 @@ public class ProcurementDomesticCustomerCreditController extends DefaultBaseCont
     }
     }
 
 
     /**
     /**
+     * 取消
+     */
+    @ApiOperation("取消变更评审资料")
+    @HasPermission({"procure-manage:domestic-trade:acancel"})
+    @GetMapping("/cancelReview")
+    public InvokeResult<Void> cancelReview(@NotBlank(message = "id不能为空！") String id,
+                                           @NotBlank(message = "status不能为空！") String status) {
+
+        procurementDomesticCustomerCreditService.updateReviewStatus(id, status);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
      * 根据ID查询变更审核的数据
      * 根据ID查询变更审核的数据
      */
      */
     @ApiOperation("根据ID查询变更审核的数据")
     @ApiOperation("根据ID查询变更审核的数据")

@@ -309,6 +309,18 @@ public class ProcurementDomesticCustomerCredit extends BaseEntity implements Bas
     private Boolean showExamineDetail;
     private Boolean showExamineDetail;
 
 
     /**
     /**
+     * 是否展示变更评审审核按钮(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showChangeReviewExamine = false;
+
+    /**
+     * 是否展示变更评审审核详情按钮(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showChangeReviewExamineDetail;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -75,32 +75,7 @@ public class ProcurementDomesticCustomerCreditServiceImpl
         PageHelperUtil.startPage(pageIndex, pageSize);
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<ProcurementDomesticCustomerCredit> datas = this.query(vo);
         List<ProcurementDomesticCustomerCredit> datas = this.query(vo);
         if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) {
         if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) {
-            //流程数据
-            List<FlowInstanceWrapper> flowByConditionList = flowInstanceWrapperService.getFlowByBusinessIdList(
-                    datas.stream().map(ProcurementDomesticCustomerCredit::getId).collect(Collectors.toList()));
-            if (org.apache.commons.collections.CollectionUtils.isNotEmpty(flowByConditionList)) {
-                List<String> idList = flowByConditionList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toList());
-                for (ProcurementDomesticCustomerCredit customerCredit : datas) {
-                    if (idList.contains(customerCredit.getId())) {
-                        customerCredit.setShowExamineDetail(true);
-                    } else {
-                        customerCredit.setShowExamineDetail(false);
-                    }
-                }
-            }
-            // 获取当前人员的待办任务数据
-            List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
-            if (CollectionUtils.isEmpty(flowTaskList)) {
-                return PageResultUtil.convert(new PageInfo<>(datas));
-            }
-            List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
-            for (ProcurementDomesticCustomerCredit customerCredit : datas) {
-                if (ids.contains(customerCredit.getId())) {
-                    customerCredit.setShowExamine(true);
-                } else {
-                    customerCredit.setShowExamine(false);
-                }
-            }
+            fillShowExamineInfo(datas);
         }
         }
         return PageResultUtil.convert(new PageInfo<>(datas));
         return PageResultUtil.convert(new PageInfo<>(datas));
     }
     }
@@ -113,24 +88,7 @@ public class ProcurementDomesticCustomerCreditServiceImpl
     @Override
     @Override
     public ProcurementDomesticCustomerCredit findById(String id) {
     public ProcurementDomesticCustomerCredit findById(String id) {
         ProcurementDomesticCustomerCredit customerCredit = getBaseMapper().findById(id);
         ProcurementDomesticCustomerCredit customerCredit = getBaseMapper().findById(id);
-        //流程数据
-        List<String> ids = new ArrayList<>();
-        ids.add(customerCredit.getId());
-        List<FlowInstanceWrapper> flowByBusinessIdList = flowInstanceWrapperService.getFlowByBusinessIdList(ids);
-        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(flowByBusinessIdList)) {
-            List<String> collect = flowByBusinessIdList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toList());
-            customerCredit.setShowExamineDetail(collect.contains(customerCredit.getId()));
-        } else {
-            customerCredit.setShowExamineDetail(false);
-        }
-        // 获取当前人员的待办任务数据
-        List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
-        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(flowTaskList)) {
-            List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
-            customerCredit.setShowExamine(businessIds.contains(customerCredit.getId()));
-        } else {
-            customerCredit.setShowExamine(false);
-        }
+        fillShowExamineInfo(java.util.Collections.singletonList(customerCredit));
         return customerCredit;
         return customerCredit;
     }
     }
 
 
@@ -339,6 +297,17 @@ public class ProcurementDomesticCustomerCreditServiceImpl
     }
     }
 
 
     @Override
     @Override
+    public void updateReviewStatus(String id, String status) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
+            throw new DefaultClientException("资信ID、审核状态不能为空！");
+        }
+        LambdaUpdateWrapper<ProcurementDomesticCustomerCredit> updateWrapper = Wrappers.lambdaUpdate(ProcurementDomesticCustomerCredit.class)
+                .set(ProcurementDomesticCustomerCredit::getChangeReviewStatus, status)
+                .eq(ProcurementDomesticCustomerCredit::getId, id);
+        getBaseMapper().update(updateWrapper);
+    }
+
+    @Override
     public void updateFreeze(List<String> ids, Boolean freeze) {
     public void updateFreeze(List<String> ids, Boolean freeze) {
         if (CollectionUtils.isEmpty(ids) || freeze == null) {
         if (CollectionUtils.isEmpty(ids) || freeze == null) {
             throw new DefaultClientException("资信IDs、冻结状态不能为空！");
             throw new DefaultClientException("资信IDs、冻结状态不能为空！");
@@ -485,6 +454,48 @@ public class ProcurementDomesticCustomerCreditServiceImpl
     }
     }
 
 
     /**
     /**
+     * 回填主审核和变更评审的审核按钮展示信息
+     *
+     * @param datas 数据列表
+     */
+    private void fillShowExamineInfo(List<ProcurementDomesticCustomerCredit> datas) {
+        if (CollectionUtils.isEmpty(datas)) {
+            return;
+        }
+
+        List<ProcurementDomesticCustomerCredit> validDatas = datas.stream()
+                .filter(java.util.Objects::nonNull)
+                .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(validDatas)) {
+            return;
+        }
+
+        List<String> businessIds = validDatas.stream().map(ProcurementDomesticCustomerCredit::getId).collect(Collectors.toList());
+        List<FlowInstanceWrapper> flowByConditionList = flowInstanceWrapperService.getFlowByBusinessIdList(businessIds);
+        Set<String> flowBusinessIdSet = CollectionUtils.isNotEmpty(flowByConditionList)
+                ? flowByConditionList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toSet())
+                : new HashSet<>();
+
+        List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+        Set<String> todoBusinessIdSet = CollectionUtils.isNotEmpty(flowTaskList)
+                ? flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toSet())
+                : new HashSet<>();
+
+        for (ProcurementDomesticCustomerCredit customerCredit : validDatas) {
+            boolean hasFlow = flowBusinessIdSet.contains(customerCredit.getId());
+            boolean hasTodo = todoBusinessIdSet.contains(customerCredit.getId());
+
+            customerCredit.setShowExamineDetail(hasFlow && StringUtils.isNotBlank(customerCredit.getStatus()));
+            customerCredit.setShowExamine(hasTodo && "AUDIT".equals(customerCredit.getStatus()));
+
+            customerCredit.setShowChangeReviewExamineDetail(
+                    hasFlow && StringUtils.isNotBlank(customerCredit.getChangeReviewStatus()));
+            customerCredit.setShowChangeReviewExamine(
+                    hasTodo && "AUDIT".equals(customerCredit.getChangeReviewStatus()));
+        }
+    }
+
+    /**
      * 获取节点首个审批人名称
      * 获取节点首个审批人名称
      *
      *
      * @param nodeJson 流程节点JSON
      * @param nodeJson 流程节点JSON

@@ -66,6 +66,11 @@ public interface ProcurementDomesticCustomerCreditService extends BaseMpService<
     void updateStatus(String id, String status);
     void updateStatus(String id, String status);
 
 
     /**
     /**
+     * 更新评审资料审核状态
+     */
+    void updateReviewStatus(String id, String status);
+
+    /**
      * 更新冻结状态
      * 更新冻结状态
      */
      */
     void updateFreeze(List<String> ids, Boolean freeze);
     void updateFreeze(List<String> ids, Boolean freeze);