From 2df3a9452abaf4335143cb3fe356a703466c28ed Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Sep 2022 11:27:56 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1-?= =?UTF-8?q?=E3=80=8B=20=E7=A7=91=E5=AE=A4=E6=80=BB=E4=BD=93=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=EF=BC=8C=E5=89=8D=E5=8D=81=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/index/contoller/IndexController.java | 9 ++- .../com/jero/index/service/IndexService.java | 59 ++++++++++++++++++- .../java/com/jero/index/vo/HistogramVO.java | 20 +++++++ 3 files changed, 83 insertions(+), 5 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/index/vo/HistogramVO.java 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 7b01d962..e1de0629 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 @@ -2,6 +2,7 @@ package com.jero.index.contoller; import com.jero.common.api.vo.Result; import com.jero.index.service.IndexService; +import com.jero.index.vo.HistogramVO; import com.jero.index.vo.LineChartListVO; import com.jero.index.vo.LineChartVO; import io.swagger.annotations.Api; @@ -56,8 +57,9 @@ public class IndexController { @ApiOperation(value = "科室总体统计") @GetMapping(value = "/overallDepartmentStatistics") - public Result overallDepartmentStatistics() { - return Result.OK(); + public Result> overallDepartmentStatistics() { + List histogramVOS = indexService.overallDepartmentStatistics(); + return Result.OK(histogramVOS); } @ApiOperation(value = "总金额分类统计") @@ -75,6 +77,7 @@ public class IndexController { @ApiOperation(value = "前十统计") @GetMapping(value = "/top10Statistics") public Result top10Statistics() { - return Result.OK(); + List histogramVOS = indexService.top10Statistics(); + return Result.OK(histogramVOS); } } 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 bf2e287b..85fce3c0 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 @@ -1,13 +1,15 @@ package com.jero.index.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import com.jero.index.vo.HistogramVO; import com.jero.index.vo.LineChartListVO; import com.jero.index.vo.LineChartVO; import com.jero.project.service.IPayWorkingGroupService; -import com.jero.statistics.entity.AllProjectStatistics; -import com.jero.statistics.entity.AllProjectStatisticsSearch; +import com.jero.statistics.entity.*; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -149,4 +151,57 @@ public class IndexService { return list; } + public List overallDepartmentStatistics() { + String year = String.valueOf(DateUtil.year(new DateTime())); + DepartStatisticsSearch departStatisticsSearch = new DepartStatisticsSearch(); + departStatisticsSearch.setPaymentYear(year); + Page page = new Page<>(-1, -1); + IPage pageList = payWorkingGroupService.queryPageListDepartment(page, departStatisticsSearch, new ArrayList<>()); + List records = pageList.getRecords(); + + return convertDepartStatistics(records); + } + + private List convertDepartStatistics(List list){ + List histogramVOlist=Lists.newArrayList(); + for (DepartStatistics departStatistics :list) { + HistogramVO histogramVO = new HistogramVO(); + histogramVO.setName(departStatistics.getDepartName()); + histogramVO.setConfirmAmount(departStatistics.getConfirmAmount()); + histogramVO.setAllMoney(departStatistics.getAllMoney()); + histogramVOlist.add(histogramVO); + } + return histogramVOlist; + } + + public List top10Statistics() { + String year = String.valueOf(DateUtil.year(new DateTime())); + Page page = new Page<>(1, 10); + CompanyComeMoneySearch companyComeMoneySearch = new CompanyComeMoneySearch(); + companyComeMoneySearch.setYear(year); + companyComeMoneySearch.setColumn("allMoney"); + companyComeMoneySearch.setOrder("desc"); + IPage pageList = payWorkingGroupService.queryPageListForCompany(page, companyComeMoneySearch, null); + List records = pageList.getRecords(); + + return convertCompanyComeMoneyList(records); + } + + private List convertCompanyComeMoneyList(List list) { + List histogramVOlist=Lists.newArrayList(); + for (CompanyComeMoneyList companyComeMoneyList :list) { + histogramVOlist.add(convertFromCompanyComeMoneyList(companyComeMoneyList)); + } + return histogramVOlist; + } + + private HistogramVO convertFromCompanyComeMoneyList(CompanyComeMoneyList companyComeMoneyList) { + HistogramVO histogramVO = new HistogramVO(); + histogramVO.setAllMoney(companyComeMoneyList.getAllMoney()); + histogramVO.setConfirmAmount(companyComeMoneyList.getConfirmAmount()); + histogramVO.setName(companyComeMoneyList.getChargeCompanyName()); + return histogramVO; + } + + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/HistogramVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/HistogramVO.java new file mode 100644 index 00000000..c7f1f21f --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/HistogramVO.java @@ -0,0 +1,20 @@ +package com.jero.index.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liJiaRao + * @date 2022-09-02 10:45 + */ +@Data +public class HistogramVO { + @ApiModelProperty(value = "合同金额") + private String allMoney; + + @ApiModelProperty(value = "确认收入金额") + private String confirmAmount; + + @ApiModelProperty(value = "名字") + private String name; +}