From ab421b27c13e316237b947d3dc290176377981d7 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 14 Mar 2024 12:04:10 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E5=91=98=E7=BB=9F=E8=AE=A1=20?= =?UTF-8?q?=E6=8A=98=E7=BA=BF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/TbMemberProjectSubitemMapper.java | 5 +++++ .../xml/TbMemberProjectSubitemMapper.xml | 8 ++++++++ .../ITbMemberProjectSubitemService.java | 2 +- .../TbMemberProjectSubitemServiceImpl.java | 17 ++++++++++++++-- .../MemberStatisticsController.java | 4 ++-- .../statistics/entity/MemberLineChartMap.java | 20 +++++++++++++++++++ .../statistics/entity/MemberLineChartVO.java | 4 ++-- 7 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberLineChartMap.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java index 0c2b46a0..6c3164dc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java @@ -1,11 +1,14 @@ package com.jero.member.mapper; import java.util.List; +import java.util.Map; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.statistics.entity.MemberLineChartMap; +import com.jero.statistics.entity.MemberLineChartVO; import org.apache.ibatis.annotations.Param; import com.jero.member.entity.TbMemberProjectSubitem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -38,4 +41,6 @@ public interface TbMemberProjectSubitemMapper extends BaseMapper getByYear(@Param("startYear") Integer startYear, @Param("endYear") Integer endYear); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml index cbc9d98b..8e95018b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml @@ -103,4 +103,12 @@ and tmps.effective_date is not null + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java index 277c5915..c867d50c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java @@ -93,5 +93,5 @@ public interface ITbMemberProjectSubitemService extends IService byYear = tbMemberProjectSubitemMapper.getByYear(startYear, endYear); + Map map = byYear.stream().collect(Collectors.toMap(MemberLineChartMap::getYear, MemberLineChartMap::getValue)); + List value = new ArrayList<>(); + List year = new ArrayList<>(); + for (int i = startYear; i <= endYear; i++) { + year.add(i); + value.add(map.getOrDefault(i,"0")); + } + memberLineChartVO.setValue(value); + memberLineChartVO.setYear(year); + return memberLineChartVO; } private TbMemberProjectSubitem setCopyValue(TbMemberProjectSubitem memberProjectSubitem) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/MemberStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/MemberStatisticsController.java index 0d7efbbd..8339f1aa 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/MemberStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/MemberStatisticsController.java @@ -37,8 +37,8 @@ public class MemberStatisticsController { @ApiOperation(value = "折线图") @GetMapping(value = "/lineChart") - public Result lineChart(@RequestParam(name="startYear")String startYear, - @RequestParam(name="endYear")String endYear) { + public Result lineChart(@RequestParam(name="startYear")Integer startYear, + @RequestParam(name="endYear")Integer endYear) { MemberLineChartVO lineChartVO = memberProjectSubitemService.lineChart(startYear,endYear); return Result.OK(lineChartVO); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberLineChartMap.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberLineChartMap.java new file mode 100644 index 00000000..1bd9e80c --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberLineChartMap.java @@ -0,0 +1,20 @@ +package com.jero.statistics.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author liJiaRao + * @date 2022-09-01 16:48 + */ +@Data +public class MemberLineChartMap { + @ApiModelProperty(value = "会费") + private String value; + + @ApiModelProperty(value = "年份") + private Integer year; + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberLineChartVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberLineChartVO.java index 0b56202d..aa358bf9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberLineChartVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberLineChartVO.java @@ -11,10 +11,10 @@ import java.util.List; */ @Data public class MemberLineChartVO { - @ApiModelProperty(value = "数量") + @ApiModelProperty(value = "会费") private List value; @ApiModelProperty(value = "年份") - private List year; + private List year; }