利润结算表过滤采购付款打款状态

hx-sale/src/main/java/com/fjhx/sale/entity/statement/dto/ProfitSettlementDto.java

@@ -21,6 +21,6 @@ public class ProfitSettlementDto extends BaseSelectDto {
     /**
      * 是否到账 0:未到账  1已到账
      */
-    private Integer isArrival;
+    private String isArrival;
 
 }

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

@@ -218,10 +218,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t1", Contract::getCode));
         }
-        if(dto.getIsArrival()==1){//已到账----//预付比例等于0||到账认领金额 >= 合同金额 * 预付比例%
-            wrapper.eq("t1",Contract::getAdvanceRatio,"0").or().eq("t1.refundStatusNew",20);
-        }else{
-            wrapper.ne("t1",Contract::getAdvanceRatio,"0").ne("t1.refundStatusNew",20);
+        if(StringUtils.isNotEmpty(dto.getIsArrival())){
+            if(StringUtils.equals(dto.getIsArrival(),"1")){//已到账----//预付比例等于0||到账认领金额 >= 合同金额 * 预付比例%
+                wrapper.eq("t1",Contract::getAdvanceRatio,"0").or().eq("t1.refundStatusNew",20);
+            }else{
+                wrapper.ne("t1",Contract::getAdvanceRatio,"0").ne("t1.refundStatusNew",20);
+            }
         }
         Page<ContractVo> page = baseMapper.getProfitSettlement(dto.getPage(),wrapper);
         return page;

hx-sale/src/main/java/com/fjhx/sale/service/statement/impl/SaleStatementServiceImpl.java

@@ -160,30 +160,29 @@ public class SaleStatementServiceImpl implements SaleStatementService {
         return result;
     }
 
-    /**
-     * 获取合同分页
-     */
-    private Page<Contract> getContractPage(ProfitSettlementDto dto) {
-
-
-        IWrapper<Contract> wrapper = IWrapper.getWrapper();
-        wrapper.orderByDesc(Contract::getCreateTime);
-        wrapper.between(Contract::getStatus, FlowStatusEnum1.PASS.getKey(), FlowStatusEnum1.UPDATE.getKey() - 1);
-        if(ObjectUtil.isNotEmpty(dto.getSettlementStatus())){
-            wrapper.eq( Contract::getSettlementStatus, dto.getSettlementStatus());
-        }
-        if(ObjectUtil.isNotEmpty(dto.getUserId())){
-            wrapper.eq( Contract::getCreateUser, dto.getUserId());
-        }
-        if(StringUtil.isNotEmpty(dto.getKeyword())){
-            wrapper.like(Contract::getCode,dto.getKeyword());
-        }
-        if(dto.getIsArrival()==1){//已到账----//预付比例等于0||到账认领金额 >= 合同金额 * 预付比例%
-            wrapper.eq(Contract::getAdvanceRatio,"0");
-        }
-        Page<Contract> page = contractService.page(dto.getPage(),wrapper);
-        return page;
-    }
+//    /**
+//     * 获取合同分页
+//     */
+//    private Page<Contract> getContractPage(ProfitSettlementDto dto) {
+//
+//        IWrapper<Contract> wrapper = IWrapper.getWrapper();
+//        wrapper.orderByDesc(Contract::getCreateTime);
+//        wrapper.between(Contract::getStatus, FlowStatusEnum1.PASS.getKey(), FlowStatusEnum1.UPDATE.getKey() - 1);
+//        if(ObjectUtil.isNotEmpty(dto.getSettlementStatus())){
+//            wrapper.eq( Contract::getSettlementStatus, dto.getSettlementStatus());
+//        }
+//        if(ObjectUtil.isNotEmpty(dto.getUserId())){
+//            wrapper.eq( Contract::getCreateUser, dto.getUserId());
+//        }
+//        if(StringUtil.isNotEmpty(dto.getKeyword())){
+//            wrapper.like(Contract::getCode,dto.getKeyword());
+//        }
+//        if(dto.getIsArrival()==1){//已到账----//预付比例等于0||到账认领金额 >= 合同金额 * 预付比例%
+//            wrapper.eq(Contract::getAdvanceRatio,"0");
+//        }
+//        Page<Contract> page = contractService.page(dto.getPage(),wrapper);
+//        return page;
+//    }
 
     /**
      * 创建结果集list