楚江ERP：合同列表审核按钮展示逻辑调整

@@ -156,12 +156,18 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     private String standardApprovedName;
     private String standardApprovedName;
 
 
     /**
     /**
-     * 是否展示审核按钮(非持久化字段)
+     * 是否展示正式合同审核按钮(非持久化字段)
      */
      */
-    @ApiModelProperty(value = "是否展示审核按钮")
+    @ApiModelProperty(value = "是否展示正式合同审核按钮")
     private Boolean showExamine;
     private Boolean showExamine;
 
 
     /**
     /**
+     * 是否展示标准合同审核按钮(非持久化字段)
+     */
+    @ApiModelProperty(value = "是否展示标准合同审核按钮")
+    private Boolean standardShowExamine;
+
+    /**
      * 发货状态
      * 发货状态
      */
      */
     @ApiModelProperty(value = "发货状态")
     @ApiModelProperty(value = "发货状态")

@@ -294,9 +294,15 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private BigDecimal totalAmountIncludingTax;
     private BigDecimal totalAmountIncludingTax;
 
 
     /**
     /**
-     * 是否展示审核按钮(非持久化字段)
+     * 是否展示正式合同审核按钮(非持久化字段)
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)
     private Boolean showExamine;
     private Boolean showExamine;
 
 
+
+    /**
+     * 是否展示标准合同审核按钮(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean standardShowExamine;
 }
 }

@@ -80,11 +80,17 @@ public class ContractDistributorStandardServiceImpl extends
             return PageResultUtil.convert(new PageInfo<>(datas));
             return PageResultUtil.convert(new PageInfo<>(datas));
         }
         }
 
 
-        Set<String> ids = flowTaskList.stream()
+        Set<String> formalContractIds = flowTaskList.stream()
+                .filter(flowTaskDto -> FORMAL_FLAG.equals(flowTaskDto.getMode()))
+                .map(FlowTaskDto::getBusinessId)
+                .collect(Collectors.toSet());
+        Set<String> standardContractIds = flowTaskList.stream()
+                .filter(flowTaskDto -> STANDARD_FLAG.equals(flowTaskDto.getMode()))
                 .map(FlowTaskDto::getBusinessId)
                 .map(FlowTaskDto::getBusinessId)
                 .collect(Collectors.toSet());
                 .collect(Collectors.toSet());
         for (ContractDistributorStandard standard : datas) {
         for (ContractDistributorStandard standard : datas) {
-            standard.setShowExamine(ids.contains(standard.getId()));
+            standard.setShowExamine(formalContractIds.contains(standard.getId()));
+            standard.setStandardShowExamine(standardContractIds.contains(standard.getId()));
         }
         }
 
 
         return PageResultUtil.convert(new PageInfo<>(datas));
         return PageResultUtil.convert(new PageInfo<>(datas));