浏览代码

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

yzc 1 年之前
父节点
当前提交
f442f0bab4
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

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

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