From bf839544f9da8ac7ccac00b970c233356ae5ba50 Mon Sep 17 00:00:00 2001
From: markliu2013 <markliu2013@gmail.com>
Date: Mon, 18 Mar 2024 10:17:27 +0800
Subject: [PATCH] save

---
 src/main/java/cn/biq/mn/TestController.java            |  2 +-
 .../java/cn/biq/mn/report/CategoryReportQueryForm.java | 10 +++++-----
 src/main/java/cn/biq/mn/report/ReportService.java      |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cn/biq/mn/TestController.java b/src/main/java/cn/biq/mn/TestController.java
index ed8bd24..6ee712b 100644
--- a/src/main/java/cn/biq/mn/TestController.java
+++ b/src/main/java/cn/biq/mn/TestController.java
@@ -21,7 +21,7 @@ public class TestController {
 
     @RequestMapping(method = RequestMethod.GET, value = "/version")
     public BaseResponse handleVersion() {
-        return new DataResponse<>("93.36");
+        return new DataResponse<>("93.37");
     }
 
     @GetMapping("/test3")
diff --git a/src/main/java/cn/biq/mn/report/CategoryReportQueryForm.java b/src/main/java/cn/biq/mn/report/CategoryReportQueryForm.java
index f0bb181..07039c6 100644
--- a/src/main/java/cn/biq/mn/report/CategoryReportQueryForm.java
+++ b/src/main/java/cn/biq/mn/report/CategoryReportQueryForm.java
@@ -17,14 +17,14 @@
 public class CategoryReportQueryForm {
 
     @NotNull
-    private Integer bookId;
+    private Integer book;
     private Long minTime;
     private Long maxTime;
     private String title;
     private Set<Integer> payees;
     private Set<Integer> categories;
     private Set<Integer> tags;
-    private Integer accountId;
+    private Integer account;
 
     public void buildPredicate(BooleanBuilder booleanBuilder, QBalanceFlow balanceFlow) {
         if (minTime != null) {
@@ -43,9 +43,9 @@ public void buildPredicate(BooleanBuilder booleanBuilder, QBalanceFlow balanceFl
         if (payees != null) {
             booleanBuilder.and(balanceFlow.payee.id.in(payees));
         }
-        if (accountId != null) {
-            BooleanBuilder builder1 = new BooleanBuilder(balanceFlow.account.id.eq(accountId));
-            BooleanBuilder builder2 = new BooleanBuilder(balanceFlow.to.id.eq(accountId));
+        if (account != null) {
+            BooleanBuilder builder1 = new BooleanBuilder(balanceFlow.account.id.eq(account));
+            BooleanBuilder builder2 = new BooleanBuilder(balanceFlow.to.id.eq(account));
             booleanBuilder.and(builder1.or(builder2));
         }
 //        if (categories != null) {
diff --git a/src/main/java/cn/biq/mn/report/ReportService.java b/src/main/java/cn/biq/mn/report/ReportService.java
index 4f12fd8..3ade077 100644
--- a/src/main/java/cn/biq/mn/report/ReportService.java
+++ b/src/main/java/cn/biq/mn/report/ReportService.java
@@ -53,7 +53,7 @@ public class ReportService {
 
     public List<ChartVO> reportCategory(CategoryReportQueryForm form, CategoryType type) {
         List<ChartVO> result = new ArrayList<>();
-        Book book = baseService.getBookInGroup(form.getBookId());
+        Book book = baseService.getBookInGroup(form.getBook());
         List<Category> categories = categoryRepository.findAllByBookAndType(book, type);
         Category requestCategory = null;
         List<Category> rootCategories = new ArrayList<>();
@@ -104,7 +104,7 @@ public List<ChartVO> reportCategory(CategoryReportQueryForm form, CategoryType t
 
     public List<ChartVO> reportTag(CategoryReportQueryForm form, FlowType type) {
         List<ChartVO> result = new ArrayList<>();
-        Book book = baseService.getBookInGroup(form.getBookId());
+        Book book = baseService.getBookInGroup(form.getBook());
         List<Tag> tags = new ArrayList<>();
         if (type == FlowType.EXPENSE) {
             tags = tagRepository.findByBookAndEnableAndCanExpense(book, true, true);