采购计划：审核、审核详情按钮展示

房远帅
1 parent 6e425951
Showing 3 changed files with 70 additions and 16 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/procurement/GetProcurementPlanBo.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/ProcurementPlan.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/plan/ProcurementPlanServiceImpl.java
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/procurement/GetProcurementPlanBo.java
View file @c11706d
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/procurement/GetProcurementPlanBo.java
View file @c11706d
@@ -4,11 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.web.core.bo.BaseBo;
-import com.lframework.starter.web.core.utils.ApplicationUtil;
-import com.lframework.xingyun.basedata.entity.CompanyShort;
-import com.lframework.xingyun.basedata.entity.Supplier;
-import com.lframework.xingyun.basedata.service.company.CompanyShortService;
-import com.lframework.xingyun.basedata.service.supplier.SupplierService;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlan;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlanLine;
 import io.swagger.annotations.ApiModelProperty;
@@ -525,10 +520,16 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
     private String workshopId;
     /**
-     * 前端行标识
+     * 是否展示审核按钮
      */
-    @ApiModelProperty("前端行标识")
-    private String itemId;
+    @ApiModelProperty("是否展示审核按钮")
+    private Boolean showExamine = false;
+
+    /**
+     * 是否展示审核详情按钮
+     */
+    @ApiModelProperty("是否展示审核详情按钮")
+    private Boolean showExamineDetail;
     /**
      * 创建人ID
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/ProcurementPlan.java
View file @c11706d
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/ProcurementPlan.java
View file @c11706d
@@ -303,6 +303,18 @@ public class ProcurementPlan extends BaseEntity implements BaseDto {
   private String attachmentFileNames;
   /**
+   * 是否展示审核按钮(非持久化字段)
+   */
+  @TableField(exist = false)
+  private Boolean showExamine = false;
+
+  /**
+   * 是否展示审核详情按钮(非持久化字段)
+   */
+  @TableField(exist = false)
+  private Boolean showExamineDetail;
+
+  /**
    * 创建人ID
    */
   @TableField(fill = FieldFill.INSERT)
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/plan/ProcurementPlanServiceImpl.java
View file @c11706d
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/plan/ProcurementPlanServiceImpl.java
View file @c11706d
@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 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.service.FlowTaskWrapperService;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.exceptions.impl.InputErrorException;
 import com.lframework.starter.common.utils.Assert;
@@ -15,6 +18,7 @@ import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.NumberUtil;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.utils.OpLogUtil;
@@ -25,6 +29,7 @@ import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.bo.procurement.GetProcurementPlanBo;
+import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlan;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlanLine;
 import com.lframework.xingyun.sc.procurement.mappers.plan.ProcurementPlanMapper;
@@ -40,13 +45,7 @@ import com.lframework.xingyun.sc.procurement.vo.plan.UpdateProcurementPlanVo;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,16 +70,19 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
   private FlowTaskWrapperService flowTaskWrapperService;
   @Resource
   private ProcurementBuyoutApplyService procurementBuyoutApplyService;
+  @Resource
+  private FlowTaskWrapperMapper flowTaskWrapperMapper;
   @Override
   public PageResult<ProcurementPlan> query(Integer pageIndex, Integer pageSize,
-      QueryProcurementPlanVo vo) {
+                                           QueryProcurementPlanVo vo) {
     Assert.greaterThanZero(pageIndex);
     Assert.greaterThanZero(pageSize);
     PageHelperUtil.startPage(pageIndex, pageSize);
     List<ProcurementPlan> datas = this.query(vo);
+    fillShowExamineInfo(datas);
     return PageResultUtil.convert(new PageInfo<>(datas));
   }
@@ -104,6 +106,8 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
     List<ProcurementPlanLine> lines = procurementPlanLineService.getByProcurementPlanId(id);
+    fillShowExamineInfo(Collections.singletonList(plan));
+
     return new GetProcurementPlanBo(plan, lines);
   }
@@ -620,4 +624,41 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
     return candidate;
   }
+
+  /**
+   * 回填审核按钮展示信息
+   *
+   * @param datas 数据列表
+   */
+  private void fillShowExamineInfo(List<ProcurementPlan> datas) {
+    if (CollectionUtil.isEmpty(datas)) {
+      return;
+    }
+
+    List<ProcurementPlan> validDatas = datas.stream()
+            .filter(Objects::nonNull)
+            .collect(Collectors.toList());
+    if (CollectionUtil.isEmpty(validDatas)) {
+      return;
+    }
+
+    List<String> businessIds = validDatas.stream().map(ProcurementPlan::getId).collect(Collectors.toList());
+    List<FlowInstanceWrapper> flowList = flowInstanceWrapperService.getFlowByBusinessIdList(businessIds);
+    Set<String> flowBusinessIdSet = CollectionUtil.isNotEmpty(flowList)
+            ? flowList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toSet())
+            : new HashSet<>();
+
+    List<FlowTaskDto> todoFlowTaskList = flowTaskWrapperMapper.queryTodoList(
+            new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+    Set<String> todoBusinessIdSet = CollectionUtil.isNotEmpty(todoFlowTaskList)
+            ? todoFlowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toSet())
+            : new HashSet<>();
+
+    for (ProcurementPlan data : validDatas) {
+      boolean hasFlow = flowBusinessIdSet.contains(data.getId());
+      boolean hasTodo = todoBusinessIdSet.contains(data.getId());
+      data.setShowExamineDetail(hasFlow && StringUtils.isNotBlank(data.getApprovalStatus()));
+      data.setShowExamine(hasTodo && CustomerDevelopStatus.AUDIT.name().equals(data.getApprovalStatus()));
+    }
+  }
 }