外销跟单 采购数据添加过滤

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -27,7 +27,6 @@ import com.fjhx.common.entity.contract.po.ContractTemplate;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.entity.currency.po.CurrencyRate;
 import com.fjhx.common.entity.documentary.bo.DocumentaryData;
-import com.fjhx.common.entity.documentary.po.Documentary;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.contract.ContractTemplateService;
 import com.fjhx.common.service.corporation.CorporationService;
@@ -61,7 +60,6 @@ import com.fjhx.sale.entity.contract.dto.ContractDto;
 import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
 import com.fjhx.sale.entity.contract.dto.DecisionAidDto;
 import com.fjhx.sale.entity.contract.dto.PayDecisionAidDto;
-import com.fjhx.sale.entity.contract.enums.DocumentaryTypeEnum;
 import com.fjhx.sale.entity.contract.po.*;
 import com.fjhx.sale.entity.contract.vo.*;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
@@ -91,7 +89,6 @@ import com.ruoyi.framework.config.ThreadPoolConfig;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.utils.UserUtil;
 import org.apache.commons.collections4.MapUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.core.context.SecurityContext;
@@ -270,7 +267,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         wrapper.orderByDesc("t1", Contract::getCreateTime);
         if (StringUtils.isNotEmpty(dto.getStatus())) {
             wrapper.eq("t1", Contract::getStatus, dto.getStatus());
-        }else{
+        } else {
             wrapper.eq("t1", Contract::getIsChange, "0");//列表只展示未变更得数据
             wrapper.ne("t1", Contract::getIsShow, 1);
             wrapper.between("t1", Contract::getStatus, FlowStatusEnum1.DRAFT.getKey(), FlowStatusEnum1.CANCELLATION.getKey() - 1);
@@ -757,7 +754,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
      */
     @Override
     public Page<ContractVo> getSalesTotalList(Page<Object> page, Long id) {
-        return baseMapper.getSalesTotalList(page,id);
+        return baseMapper.getSalesTotalList(page, id);
     }
 
     /**
@@ -1863,6 +1860,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
 
     /**
      * 外销跟单分页
+     *
      * @param dto
      * @return
      */
@@ -1878,14 +1876,14 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         wrapper.in("t1", Contract::getBuyCorporationId, authIdList);
         wrapper.orderByDesc("t1", Contract::getCreateTime);
         wrapper.eq("t1", Contract::getIsChange, "0");//列表只展示未变更得数据
-        wrapper.ne("t1",Contract::getIsShow,1);
+        wrapper.ne("t1", Contract::getIsShow, 1);
         wrapper.eq("t1", Contract::getStatus, FlowStatusEnum1.PASS.getKey());
         wrapper.eq("t1.orderStatus", dto.getOrderStatus());
-        if(dto.getDocumentarySearch()==1&&ObjectUtil.isNotEmpty(dto.getDocumentaryType())){//无记录
-            wrapper.eq("t1.documentaryCount",0);
+        if (dto.getDocumentarySearch() == 1 && ObjectUtil.isNotEmpty(dto.getDocumentaryType())) {//无记录
+            wrapper.eq("t1.documentaryCount", 0);
         }
-        if(dto.getDocumentarySearch()==2&&ObjectUtil.isNotEmpty(dto.getDocumentaryType())){//无记录
-            wrapper.gt("t1.documentaryCount",0);
+        if (dto.getDocumentarySearch() == 2 && ObjectUtil.isNotEmpty(dto.getDocumentaryType())) {//无记录
+            wrapper.gt("t1.documentaryCount", 0);
         }
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             //归属公司
@@ -1898,9 +1896,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
                     .or().in("t1", Contract::getBuyCorporationId, customerIds)
             );
         }
-        Page<ContractVo> page = baseMapper.getExportCopyList(dto.getPage(), wrapper,dto.getDocumentaryType());
+        Page<ContractVo> page = baseMapper.getExportCopyList(dto.getPage(), wrapper, dto.getDocumentaryType());
         List<ContractVo> list = page.getRecords();
-        if(CollectionUtils.isNotEmpty(list)){
+        if (CollectionUtils.isNotEmpty(list)) {
             List<Long> customerIds = list.stream().map(Contract::getBuyCorporationId).collect(Collectors.toList());
             List<Customer> customerList = customerService.list(Wrappers.<Customer>query().lambda().in(Customer::getId, customerIds));
             Map<Long, List<Customer>> cusMap = customerList.stream().distinct().collect(Collectors.groupingBy(Customer::getId));
@@ -1910,19 +1908,22 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             // 获取包装附件
             Map<Long, List<FileInfoVo>> packageFileMap = ObsFileUtil.getFileMap(ids, 2);
             //合同产品
-            List<ContractProduct> contractProductList = contractProductService.list(Wrappers.<ContractProduct>query().lambda().in(ContractProduct::getContractId,ids));
-            Map<Long,List<ContractProduct>> contractProductMap = contractProductList.stream().collect(Collectors.groupingBy(ContractProduct::getContractId));
+            List<ContractProduct> contractProductList = contractProductService.list(Wrappers.<ContractProduct>query().lambda().in(ContractProduct::getContractId, ids));
+            Map<Long, List<ContractProduct>> contractProductMap = contractProductList.stream().collect(Collectors.groupingBy(ContractProduct::getContractId));
             //采购合同
-            List<EhsdPurchase> ehsdPurchaseList = ehsdPurchaseService.list(Wrappers.<EhsdPurchase>query().lambda().in(EhsdPurchase::getDataResourceId,ids));
+            List<EhsdPurchase> ehsdPurchaseList = ehsdPurchaseService.list(Wrappers.<EhsdPurchase>query().lambda()
+                    .in(EhsdPurchase::getDataResourceId, ids)
+                    .in(EhsdPurchase::getStatus, 30, 60)//过滤审批通过和变更中的采购单
+            );
             List<Long> purchaseIds = ehsdPurchaseList.stream().map(EhsdPurchase::getId).collect(Collectors.toList());
             //查询采购跟单列表
-            List<ContractDocumentary> contractDocumentaryList = contractDocumentaryService.list(Wrappers.<ContractDocumentary>query().lambda().in(ContractDocumentary::getBusinessId,CollectionUtils.isEmpty(purchaseIds)?Arrays.asList("0"):purchaseIds));
-            Map<Long,List<ContractDocumentary>> contractDocumentaryMap = contractDocumentaryList.stream().collect(Collectors.groupingBy(ContractDocumentary::getBusinessId));
+            List<ContractDocumentary> contractDocumentaryList = contractDocumentaryService.list(Wrappers.<ContractDocumentary>query().lambda().in(ContractDocumentary::getBusinessId, CollectionUtils.isEmpty(purchaseIds) ? Arrays.asList("0") : purchaseIds));
+            Map<Long, List<ContractDocumentary>> contractDocumentaryMap = contractDocumentaryList.stream().collect(Collectors.groupingBy(ContractDocumentary::getBusinessId));
             //赋值采购合同供应商
             supplierInfoService.attributeAssign(ehsdPurchaseList, EhsdPurchase::getSellCorporationId, (item, supplierInfo) -> {
                 item.setSupplyName(supplierInfo.getName());
             });
-            Map<Long,List<EhsdPurchase>> ehsdPurchaseMap = ehsdPurchaseList.stream().collect(Collectors.groupingBy(EhsdPurchase::getDataResourceId));
+            Map<Long, List<EhsdPurchase>> ehsdPurchaseMap = ehsdPurchaseList.stream().collect(Collectors.groupingBy(EhsdPurchase::getDataResourceId));
             for (ContractVo p : list) {
                 // 客户
                 if (MapUtils.isNotEmpty(cusMap)) {
@@ -1949,9 +1950,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
                 // 赋值采购单信息
                 if (MapUtils.isNotEmpty(ehsdPurchaseMap)) {
                     List<EhsdPurchase> purchases = ehsdPurchaseMap.get(p.getId());
-                    if(ObjectUtil.isNotEmpty(purchases)){
-                        for(EhsdPurchase e : purchases){
-                            e.setPurchaseDocumentary(contractDocumentaryMap.getOrDefault(e.getId(),null));
+                    if (ObjectUtil.isNotEmpty(purchases)) {
+                        for (EhsdPurchase e : purchases) {
+                            e.setPurchaseDocumentary(contractDocumentaryMap.getOrDefault(e.getId(), null));
                         }
                     }
                     p.setPurchaseList(purchases);
@@ -1968,8 +1969,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         //查询合同产品
         return page;
     }
+
     /**
      * 外销跟单添加备注
+     *
      * @param contractVo
      */
     @DSTransactional