From 4b5624af301dfbdcf54b65dc55aadde1b6a8efd5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 24 七月 2024 19:55:24 +0800
Subject: [PATCH] bug修改,查询季度写死“2024年一季度”

---
 finance-system/src/main/java/com/finance/system/service/TbBasicDataService.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/finance-system/src/main/java/com/finance/system/service/TbBasicDataService.java b/finance-system/src/main/java/com/finance/system/service/TbBasicDataService.java
index 164adf5..57c099c 100644
--- a/finance-system/src/main/java/com/finance/system/service/TbBasicDataService.java
+++ b/finance-system/src/main/java/com/finance/system/service/TbBasicDataService.java
@@ -36,7 +36,7 @@
 
     void importBasicData(MultipartFile file) throws Exception;
 
-    PageDTO<ScoreVO> pageScore(ScoreQuery query);
+    PageDTO<ScoreVO> pageScore(ScoreQuery query) throws Exception;
 
     R<CurrentFieldsDetailVO> fieldsDetails(Long id);
 
@@ -63,6 +63,13 @@
 
     void exportDataV2(List<String> quarterList) throws IOException;
 
+    /**
+     * @param areaCode
+     * @param nowQuarter
+     * @param yearType   1:今年 2:去年
+     * @param isAll      是否相同市下所有区数据 1:是 2 :否
+     * @return
+     */
     List<FieldAndScoreDataVO> getFieldAndScoreData(String areaCode, String nowQuarter,
-            Integer yearType);
+            Integer yearType, Integer isAll);
 }

--
Gitblit v1.7.1