Преглед изворни кода

财务账单明细搜索结算状态条件修复

lazhaoqian пре 3 година
родитељ
комит
eec723d1d2

+ 7 - 2
blade-service/trade-finance/src/main/java/org/springblade/finance/controller/AccController.java

@@ -130,8 +130,13 @@ public class AccController extends BladeController {
 			.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getInvoiceAmount, 0)
 			.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getInvoiceAmount, 0)
 			.eq(Acc::getTenantId, SecureUtil.getTenantId())
-			.eq(Acc::getIsDeleted, 0)
-			.orderByDesc(Acc::getCreateTime);
+			.eq(Acc::getIsDeleted, 0);
+		if (acc.getSettlementStatus() != null && acc.getSettlementStatus() == 1){
+			accLambdaQueryWrapper.apply("Amount = Settlement_Amount");
+		}else if (acc.getSettlementStatus() != null && acc.getSettlementStatus() == 2){
+			accLambdaQueryWrapper.apply("Amount != Settlement_Amount");
+		}
+		accLambdaQueryWrapper.orderByDesc(Acc::getCreateTime);
 		IPage<Acc> pages = accService.page(Condition.getPage(query), accLambdaQueryWrapper);
 		pages.getRecords().forEach(e -> {
 			//录入人