2022年12月16 8:59

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -442,9 +442,10 @@ public class PurchaseOrderController extends BladeController {
 		queryWrapper.between(StringUtils.isNotBlank(requiredArrivalStartDate) && StringUtils.isNotBlank(requiredArrivalEndDate), "required_arrival_date", requiredArrivalStartDate, requiredArrivalEndDate);
 		queryWrapper.between(StringUtils.isNotBlank(creditStartDate) && StringUtils.isNotBlank(creditEndDate), "credit_date", creditStartDate, creditEndDate);
 		if (gathering != null && gathering == 0) {
-			queryWrapper.eq("balance_amount", BigDecimal.ZERO);
+			queryWrapper.le("balance_amount", BigDecimal.ZERO);
+			queryWrapper.gt("settlment_amount", BigDecimal.ZERO);
 		} else if (gathering != null && gathering == 1) {
-			queryWrapper.gt("balance_amount", BigDecimal.ZERO);
+			queryWrapper.eq("settlment_amount", BigDecimal.ZERO);
 		}
 		queryWrapper.orderByDesc("create_time");
 		List<Order> records = orderService.list(queryWrapper);