From 4a91ee14954bdd85175dbed1632978e2ab2a5c68 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 18 Oct 2022 13:55:57 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=94=B6=E5=85=A5=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=BF=90=E7=BB=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/index/service/IndexService.java   |  6 +++---
 .../jero/index/vo/UncollectedPieChartVO.java   | 18 ++++++++++++++++++
 .../project/mapper/PayWorkingGroupMapper.java  |  2 +-
 .../mapper/xml/PayWorkingGroupMapper.xml       |  7 ++++++-
 4 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/index/vo/UncollectedPieChartVO.java

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 be6b3750..37f6a209 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
@@ -219,10 +219,10 @@ public class IndexService {
     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,departCode);
-        }else {
+        if (Objects.equals(type,3)){
             amountClassDTOS = payWorkingGroupMapper.amountClass1(year,column,departCode);
+        }else {
+            amountClassDTOS = payWorkingGroupMapper.amountClass(year,column,departCode,type);
         }
         Map<String, BigDecimal> decimalMap = amountClassDTOS.stream().collect(Collectors.toMap(AmountClassDTO::getChargeUse, AmountClassDTO::getMoney));
         //获取所有类型
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/UncollectedPieChartVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/UncollectedPieChartVO.java
new file mode 100644
index 00000000..81f78875
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/UncollectedPieChartVO.java
@@ -0,0 +1,18 @@
+package com.jero.index.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liJiaRao
+ * @date 2022-10-18 9:40
+ */
+@Data
+public class UncollectedPieChartVO {
+    @ApiModelProperty(value = "分类")
+    private String name;
+    @ApiModelProperty(value = "值")
+    private String value;
+    @ApiModelProperty(value = "金额")
+    private String money;
+}
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 8e12fd58..4afcfcf8 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,7 +227,7 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
 
     List<AllProjectStatistics> cumulativeListAllMoney();
 
-    List<AmountClassDTO> amountClass(@Param("year") String year, @Param("column") String column, @Param("departCode") String departCode);
+    List<AmountClassDTO> amountClass(@Param("year") String year, @Param("column") String column, @Param("departCode") String departCode, @Param("type") Integer type);
 
     List<AmountClassDTO> amountClass1(@Param("year") String year, @Param("column") String column, @Param("departCode") String departCode);
 
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 3c0af568..3c9fe29d 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
@@ -2405,7 +2405,12 @@
                ifnull(SUM(${column}),0)  as money
         FROM v_statistical v
         <where>
-            confirmDate like concat('%',#{year},'%')
+            <if test="type == 1">
+                year like concat('%',#{year},'%')
+            </if>
+            <if test="type == 2">
+                and confirmDate like concat('%',#{year},'%')
+            </if>
             <if test="departCode != null and departCode != ''">
                 and departCode = #{departCode}
             </if>