|
@@ -353,7 +353,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
public Page<ContractBudgetVo> getProfitBudgetPage(ContractSelectDto dto) {
|
|
|
IWrapper<Contract> wrapper = getWrapper();
|
|
|
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())) {
|
|
|
wrapper.eq("t1", Contract::getBuyCorporationId, dto.getCustomerId());
|
|
|
}
|