合同预算表合同状态过滤修改

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

@@ -353,10 +353,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     public Page<ContractBudgetVo> getProfitBudgetPage(ContractSelectDto dto) {
         IWrapper<Contract> wrapper = getWrapper();
         wrapper.orderByDesc("t1", Contract::getCreateTime);
-        wrapper.in("t1", Contract::getStatus,
-                FlowStatusEnum1.UNDER_REVIEW.getKey(),
-                FlowStatusEnum1.PASS.getKey()
-        );
+        wrapper.between("t1", Contract::getStatus, FlowStatusEnum1.PASS.getKey(), FlowStatusEnum1.CANCELLATION.getKey() - 1);
         if (StringUtils.isNotEmpty(dto.getCustomerId())) {
             wrapper.eq("t1", Contract::getBuyCorporationId, dto.getCustomerId());
         }

hx-sale/src/main/resources/mapper/purchase/EhsdPurchaseProductMapper.xml

@@ -38,8 +38,7 @@
             ehsd_purchase_product t1
         LEFT JOIN ehsd_purchase t2 ON t1.purchase_id = t2.id
         WHERE
-        t2.`status` >= 10
-        AND t2.`status` < 88
+        t2.`status` in(10,30)
         <if test="contractIds neq null and contractIds.size() > 0">
             <foreach collection="contractIds" item="contractId" open="AND t1.contract_id IN (" separator="," close=")">
                 #{contractId}