From 984c4c149f2e77738c9cf6a6c5938fde52b0027c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 21 Feb 2023 15:57:58 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=94=B6=E5=85=A5=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E5=B9=B4?= =?UTF-8?q?=E4=BB=BD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/index/contoller/IndexController.java | 10 +++++----- .../main/java/com/jero/index/service/IndexService.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java index 47345a25..a9591505 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.math.BigDecimal; import java.util.List; import java.util.Objects; @@ -68,15 +67,16 @@ public class IndexController { @ApiOperation(value = "收入分类统计") @GetMapping(value = "/incomeClassificationStatistics") public Result> incomeClassificationStatistics(@RequestParam(name="type", defaultValue = "1")Integer type, - @RequestParam(name="departCode",required = false)String departCode) { + @RequestParam(name="departCode",required = false)String departCode, + @RequestParam(name="year",required = false)String year) { if (Objects.equals(type,1)){ - List pieChartVOS = indexService.totalAmountClassificationStatistics("allMoney", type,departCode); + List pieChartVOS = indexService.totalAmountClassificationStatistics("allMoney", type,departCode,year); return Result.OK(pieChartVOS); }else if (Objects.equals(type,2)){ - List pieChartVOS = indexService.totalAmountClassificationStatistics("no_tax_amount", type, departCode); + List pieChartVOS = indexService.totalAmountClassificationStatistics("no_tax_amount", type, departCode, year); return Result.OK(pieChartVOS); }else if (Objects.equals(type,3)){ - List pieChartVOS = indexService.totalAmountClassificationStatistics("allMoney", type, departCode); + List pieChartVOS = indexService.totalAmountClassificationStatistics("allMoney", type, departCode, year); return Result.OK(pieChartVOS); }else { return Result.OK(); 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 1f48e38a..c89e22fc 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 @@ -12,7 +12,7 @@ import com.jero.index.vo.*; import com.jero.project.mapper.PayWorkingGroupMapper; import com.jero.project.service.IPayWorkingGroupService; import com.jero.statistics.entity.*; -import org.apache.ibatis.ognl.DynamicSubscript; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -24,8 +24,6 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import static org.apache.ibatis.ognl.DynamicSubscript.all; - /** * @author liJiaRao * @date 2022-09-01 16:32 @@ -256,8 +254,10 @@ public class IndexService { } - public List totalAmountClassificationStatistics(String column, Integer type, String departCode) { - String year = String.valueOf(DateUtil.year(new DateTime())); + public List totalAmountClassificationStatistics(String column, Integer type, String departCode, String year) { + if (StringUtils.isBlank(year)){ + year = String.valueOf(DateUtil.year(new DateTime())); + } List amountClassDTOS; if (Objects.equals(type,3)){ amountClassDTOS = payWorkingGroupMapper.amountClass1(year,column,departCode);