fix 收入分类统计运维

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));
         //获取所有类型

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;
+}

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);
 

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>