From 13a9683489be5d3439e78a48013db1640e893cfc Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 26 Sep 2022 16:28:19 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A6=96=E9=A1=B5=E6=94=B6=E5=85=A5?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/index/contoller/IndexController.java   | 9 +++++----
 .../main/java/com/jero/index/service/IndexService.java   | 6 +++---
 .../com/jero/project/mapper/PayWorkingGroupMapper.java   | 4 ++--
 .../jero/project/mapper/xml/PayWorkingGroupMapper.xml    | 6 ++++++
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java
index f72676a5..1b272966 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java
@@ -69,15 +69,16 @@ public class IndexController {
     @DictPoint
     @ApiOperation(value = "收入分类统计")
     @GetMapping(value = "/incomeClassificationStatistics")
-    public Result<List<PieChartVO>> incomeClassificationStatistics(@RequestParam(name="type", defaultValue = "1")Integer type) {
+    public Result<List<PieChartVO>> incomeClassificationStatistics(@RequestParam(name="type", defaultValue = "1")Integer type,
+                                                                   @RequestParam(name="departCode",required = false)String departCode) {
         if (Objects.equals(type,1)){
-            List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("allMoney", type);
+            List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("allMoney", type,departCode);
             return Result.OK(pieChartVOS);
         }else if (Objects.equals(type,2)){
-            List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("confirmNoTaxAmount", type);
+            List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("confirmNoTaxAmount", type, departCode);
             return Result.OK(pieChartVOS);
         }else if (Objects.equals(type,3)){
-            List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("allMoney", type);
+            List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("allMoney", type, departCode);
             return Result.OK(pieChartVOS);
         }else {
             return Result.OK();
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
index 0e51f43e..0fe78976 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
@@ -212,13 +212,13 @@ public class IndexService {
     }
 
 
-    public List<PieChartVO> totalAmountClassificationStatistics(String column, Integer type) {
+    public List<PieChartVO> totalAmountClassificationStatistics(String column, Integer type, String departCode) {
         String year = String.valueOf(DateUtil.year(new DateTime()));
         List<AmountClassDTO> amountClassDTOS;
         if (!Objects.equals(type,3)){
-            amountClassDTOS = payWorkingGroupMapper.amountClass(year,column);
+            amountClassDTOS = payWorkingGroupMapper.amountClass(year,column,departCode);
         }else {
-            amountClassDTOS = payWorkingGroupMapper.amountClass1(year,column);
+            amountClassDTOS = payWorkingGroupMapper.amountClass1(year,column,departCode);
         }
         BigDecimal all = amountClassDTOS.stream().map(AmountClassDTO::getMoney).reduce(BigDecimal.ZERO,BigDecimal::add);
         List<PieChartVO> pieChartVOS = new ArrayList<>();
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
index 14feefb3..8e12fd58 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
@@ -227,9 +227,9 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
 
     List<AllProjectStatistics> cumulativeListAllMoney();
 
-    List<AmountClassDTO> amountClass(@Param("year") String year, @Param("column") String column);
+    List<AmountClassDTO> amountClass(@Param("year") String year, @Param("column") String column, @Param("departCode") String departCode);
 
-    List<AmountClassDTO> amountClass1(@Param("year") String year, @Param("column") String column);
+    List<AmountClassDTO> amountClass1(@Param("year") String year, @Param("column") String column, @Param("departCode") String departCode);
 
     List<YearMoneyDTO> getYearMoneyDTO();
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index a3a0b550..ea33ec33 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -2402,6 +2402,9 @@
         FROM v_statistical v
         <where>
             confirmDate like concat('%',#{year},'%')
+            <if test="departCode != null and departCode != ''">
+                and departCode = #{departCode}
+            </if>
         </where>
         GROUP BY chargeUse
     </select>
@@ -2675,6 +2678,9 @@
         order by pp.createTime) v
         <where>
             confirmDate like concat('%',#{year},'%')
+            <if test="departCode != null and departCode != ''">
+                and departCode = #{departCode}
+            </if>
         </where>
         GROUP BY chargeUse
     </select>