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 239c9a47..277c5915 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 @@ -7,6 +7,7 @@ import com.jero.member.entity.TbMemberProjectSubitem; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.member.vo.CopyMemberVO; import com.jero.member.vo.EditMemberBenefitsVO; +import com.jero.statistics.entity.MemberLineChartVO; import java.util.List; @@ -91,4 +92,6 @@ public interface ITbMemberProjectSubitemService extends IService lineChart(@RequestParam(name="startYear")String startYear, + @RequestParam(name="endYear")String endYear) { + MemberLineChartVO lineChartVO = memberProjectSubitemService.lineChart(startYear,endYear); + return Result.OK(lineChartVO); + } + + @ApiOperation(value = "饼图") + @GetMapping(value = "/pieChart") + public Result> incomeClassificationStatistics(@RequestParam(name="type", defaultValue = "1")Integer type, + @RequestParam(name="departCode",required = false)String departCode, + @RequestParam(name="year",required = false)String year) { + + return Result.OK(); + + } +} 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 new file mode 100644 index 00000000..0b56202d --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberLineChartVO.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 MemberLineChartVO { + @ApiModelProperty(value = "数量") + private List value; + + @ApiModelProperty(value = "年份") + private List year; + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberPieChartVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberPieChartVO.java new file mode 100644 index 00000000..1f1a0a8d --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberPieChartVO.java @@ -0,0 +1,20 @@ +package com.jero.statistics.entity; + +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liJiaRao + * @date 2022-09-02 11:30 + */ +@Data +public class MemberPieChartVO { + @Dict(dicCode = "payment_charge_use") + @ApiModelProperty(value = "分类") + private String name; + @ApiModelProperty(value = "值") + private String value; + @ApiModelProperty(value = "金额") + private String money; +}