销售订单、待采购、已采购：列表：作废的数据不用显示

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.item.service.product.ProductInfoService;
@@ -114,18 +115,21 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
 		}
 
 		//按类型倒序 先显示合同数据 再显示申购数据
-        wrapper.orderByDesc("t2", SubscribeDetail::getDataType);
-        wrapper.orderByDesc("t2", SubscribeDetail::getCreateTime);
+		wrapper.orderByDesc("t2", SubscribeDetail::getDataType);
+		wrapper.orderByDesc("t2", SubscribeDetail::getCreateTime);
 
-        Page<SubscribeDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-        List<SubscribeDetailVo> records = page.getRecords();
+		//过滤作废的数据
+		wrapper.ne("t2", SubscribeDetail::getStatus, FlowStatusEnum1.CANCELLATION.getKey());
 
-        if (records.size() == 0) {
-            return page;
-        }
+		Page<SubscribeDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+		List<SubscribeDetailVo> records = page.getRecords();
+
+		if (records.size() == 0) {
+			return page;
+		}
 
-        //获取生产公司信息
-        List<Long> companyIds = records.stream().map(SubscribeDetail::getCompanyId).collect(Collectors.toList());
+		//获取生产公司信息
+		List<Long> companyIds = records.stream().map(SubscribeDetail::getCompanyId).collect(Collectors.toList());
         Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
 
         // 赋值产品信息

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

@@ -384,6 +384,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
 
         //是否结清过滤
         wrapper.eq("t1", Contract::getIsSettled, dto.getIsSettled());
+
+        //过滤作废的数据
+        wrapper.ne("t1", Contract::getStatus, FlowStatusEnum1.CANCELLATION.getKey());
     }
 
     /**

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -178,6 +178,9 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
 
         wrapper.orderByDesc("t1", EhsdPurchase::getCreateTime);
 
+        //过滤作废的数据
+        wrapper.ne("t1", EhsdPurchase::getStatus, FlowStatusEnum1.CANCELLATION.getKey());
+
         Page<EhsdPurchaseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<EhsdPurchaseVo> records = page.getRecords();
         if (ObjectUtils.isEmpty(records)) {