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 totalAmountClassificationStatistics(String column, Integer type, String departCode) { String year = String.valueOf(DateUtil.year(new DateTime())); List 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 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 { List cumulativeListAllMoney(); - List amountClass(@Param("year") String year, @Param("column") String column, @Param("departCode") String departCode); + List amountClass(@Param("year") String year, @Param("column") String column, @Param("departCode") String departCode, @Param("type") Integer type); List 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 - confirmDate like concat('%',#{year},'%') + + year like concat('%',#{year},'%') + + + and confirmDate like concat('%',#{year},'%') + and departCode = #{departCode}