客户资信、延期发货：审核详情按钮展示权限

@@ -462,6 +462,12 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> implements BaseD
     @ApiModelProperty(value = "是否展示审核按钮")
     private Boolean showExamine;
 
+    /**
+     * 是否展示审核详情按钮(非持久化字段)
+     */
+    @ApiModelProperty(value = "是否展示审核按钮")
+    private Boolean showExamineDetail;
+
 
     /**
      * 企业操作类型

@@ -71,9 +71,15 @@ public class GetDelayedShipmentBo extends BaseBo<DelayedShipment> {
     private Boolean showExamine;
 
     /**
+     * 是否展示审核详情按钮(非持久化字段)
+     */
+    @ApiModelProperty("是否展示审核详情按钮")
+    private Boolean showExamineDetail;
+
+    /**
      * 是否是创建人(非持久化字段)
      */
-    @ApiModelProperty("是否展示审核按钮")
+    @ApiModelProperty("是否是创建人")
     private Boolean delayedCreateBy;
 
 

@@ -4,7 +4,9 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.entity.FlowInstanceWrapper;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
+import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
@@ -86,6 +88,8 @@ public class CustomerCreditController extends DefaultBaseController {
     private ContractDistributorStandardService contractDistributorStandardService;
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
 
     /**
      * 查询列表
@@ -500,11 +504,24 @@ public class CustomerCreditController extends DefaultBaseController {
                 data.setSupervisorReviewName(sysUser.getName());
             }
         }
+
+        //流程数据
+        List<String> ids = new ArrayList<>();
+        ids.add(credit.getId());
+        List<FlowInstanceWrapper> flowByBusinessIdList = flowInstanceWrapperService.getFlowByBusinessIdList(ids);
+        if (CollectionUtils.isNotEmpty(flowByBusinessIdList)) {
+            List<String> collect = flowByBusinessIdList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toList());
+            data.setShowExamineDetail(collect.contains(credit.getId()));
+        } else {
+            data.setShowExamineDetail(false);
+        }
         // 获取当前人员的待办任务数据
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
         if (CollectionUtils.isNotEmpty(flowTaskList)) {
             List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             data.setShowExamine(businessIds.contains(credit.getId()));
+        } else {
+            data.setShowExamine(false);
         }
         // enterpriseOperationType 转中文
         String opType = data.getEnterpriseOperationType();

 package com.lframework.xingyun.sc.controller.shipments.delay;
 
 import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.entity.FlowInstanceWrapper;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
+import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
@@ -27,11 +29,13 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -51,6 +55,8 @@ public class DelayedShipmentController extends DefaultBaseController {
     private DelayedShipmentDetailService delayedShipmentDetailService;
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
 
     /**
      * 查询列表
@@ -106,9 +112,21 @@ public class DelayedShipmentController extends DefaultBaseController {
         result.setDelayedShipmentDetailList(delayedShipmentDetailList);
         // 获取当前人员的待办任务数据
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
-        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(flowTaskList)) {
+        if (CollectionUtils.isNotEmpty(flowTaskList)) {
             List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             result.setShowExamine(businessIds.contains(result.getId()));
+        } else {
+            result.setShowExamine(false);
+        }
+        //流程数据
+        List<String> ids = new ArrayList<>();
+        ids.add(result.getId());
+        List<FlowInstanceWrapper> flowByBusinessIdList = flowInstanceWrapperService.getFlowByBusinessIdList(ids);
+        if (CollectionUtils.isNotEmpty(flowByBusinessIdList)) {
+            List<String> collect = flowByBusinessIdList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toList());
+            result.setShowExamineDetail(collect.contains(result.getId()));
+        } else {
+            result.setShowExamineDetail(false);
         }
 
         return InvokeResultBuilder.success(result);

@@ -369,6 +369,12 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
     private Boolean showExamine = false;
 
     /**
+     * 是否展示审核详情按钮(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showExamineDetail;
+
+    /**
      * 流程发起人(非持久化字段)
      */
     @TableField(exist = false)

@@ -72,6 +72,12 @@ public class DelayedShipment extends BaseEntity implements BaseDto {
     private Boolean showExamine = false;
 
     /**
+     * 是否展示审核按钮详情(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showExamineDetail;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageInfo;
 import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.entity.FlowInstanceWrapper;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.service.FlowDefinitionWrapperService;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
@@ -111,6 +112,19 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<CustomerCredit> datas = this.query(vo);
         if (CollectionUtils.isNotEmpty(datas)) {
+            //流程数据
+            List<FlowInstanceWrapper> flowByConditionList = flowInstanceWrapperService.getFlowByBusinessIdList(
+                    datas.stream().map(CustomerCredit::getId).collect(Collectors.toList()));
+            if (CollectionUtils.isNotEmpty(flowByConditionList)) {
+                List<String> idList = flowByConditionList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toList());
+                for (CustomerCredit 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 (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.entity.FlowInstanceWrapper;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
@@ -29,10 +30,7 @@ import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
 import com.lframework.starter.web.inner.dto.system.UserInfoDto;
 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
-import com.lframework.xingyun.sc.entity.DelayedShipment;
-import com.lframework.xingyun.sc.entity.DelayedShipmentDetail;
-import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
-import com.lframework.xingyun.sc.entity.RequestCarTicket;
+import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.mappers.DelayedShipmentMapper;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
@@ -93,6 +91,19 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<DelayedShipment> datas = this.query(vo);
         if (CollectionUtils.isNotEmpty(datas)) {
+            //流程数据
+            List<FlowInstanceWrapper> flowByConditionList = flowInstanceWrapperService.getFlowByBusinessIdList(
+                    datas.stream().map(DelayedShipment::getId).collect(Collectors.toList()));
+            if (CollectionUtils.isNotEmpty(flowByConditionList)) {
+                List<String> idList = flowByConditionList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toList());
+                for (DelayedShipment delayedShipment : datas) {
+                    if (idList.contains(delayedShipment.getId())) {
+                        delayedShipment.setShowExamineDetail(true);
+                    } else {
+                        delayedShipment.setShowExamineDetail(false);
+                    }
+                }
+            }
             // 获取当前人员的待办任务数据
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {