|
|
@ -97,6 +97,10 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(query.getState())) { |
|
|
|
qw.eq("state", query.getState()); |
|
|
|
if("1".equals(query.getState())){ |
|
|
|
//若为认款,则按照认款日期倒序排序
|
|
|
|
qw.orderByDesc("subscriptionDate"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPaymentState())) { |
|
|
|
qw.eq("paymentState", query.getPaymentState()); |
|
|
|