|
|
@@ -154,7 +154,9 @@ public class AccController extends BladeController {
|
|
|
.eq(acc.getCreateUser() != null, Acc::getCreateUser, acc.getCreateUser())
|
|
|
.eq(acc.getSrcParentId() != null, Acc::getSrcParentId, acc.getSrcParentId())
|
|
|
.eq(ObjectUtils.isNotNull(acc.getSrcSysno()), Acc::getSrcSysno, acc.getSrcSysno())
|
|
|
- .eq(StringUtils.isNotBlank(acc.getDc()), Acc::getDc, acc.getDc());
|
|
|
+ .eq(StringUtils.isNotBlank(acc.getDc()), Acc::getDc, acc.getDc())
|
|
|
+ .like(ObjectUtil.isNotEmpty(acc.getQuantity()), Acc::getQuantity, acc.getQuantity())
|
|
|
+ .like(ObjectUtil.isNotEmpty(acc.getSettlementAmount()), Acc::getSettlementAmount, acc.getSettlementAmount());
|
|
|
accLambdaQueryWrapper.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getCheckAmount, 0)
|
|
|
.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getCheckAmount, 0)
|
|
|
.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getSettlementAmount, 0)
|