LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

全院经营数据统计 (累计)

Browse Source 
全院经营数据统计(单月)
科室总体统计
增加年份的统计
This commit is contained in:
梁琦涛
2024-01-19 17:29:55 +08:00
parent 4b3f0077d7
commit fb331b6c48
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java
+6 -13
View File
@@ -4,23 +4,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.DictPoint;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.util.oConvertUtils;
import com.jero.index.service.IndexService;
import com.jero.index.vo.*;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.statistics.entity.AllMoney;
import com.jero.statistics.entity.AllProjectStatistics;
import com.jero.statistics.entity.AllProjectStatisticsOther;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -28,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import java.text.DecimalFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
@@ -54,8 +47,8 @@ public class IndexController {
@ApiOperation(value = "折线图列表")
@GetMapping(value = "/lineChartList")
public Result<List<LineChartListVO>> lineChartList() {
List<LineChartListVO> list = indexService.lineChartList();
public Result<List<LineChartListVO>> lineChartList(@RequestParam(name = "year",required = false) String year) {
List<LineChartListVO> list = indexService.lineChartList(year);
return Result.OK(list);
}
@@ -68,15 +61,15 @@ public class IndexController {
@ApiOperation(value = "累计图列表")
@GetMapping(value = "/cumulativeGraphList")
public Result<List<LineChartListVO>> cumulativeGraphList() {
List<LineChartListVO> list = indexService.cumulativeGraphList();
public Result<List<LineChartListVO>> cumulativeGraphList(@RequestParam(name = "year",required = false) String year) {
List<LineChartListVO> list = indexService.cumulativeGraphList(year);
return Result.OK(list);
}
@ApiOperation(value = "科室总体统计")
@GetMapping(value = "/overallDepartmentStatistics")
public Result<List<HistogramVO>> overallDepartmentStatistics() {
List<HistogramVO> histogramVOS = indexService.overallDepartmentStatistics();
public Result<List<HistogramVO>> overallDepartmentStatistics(@RequestParam(name = "year",required = false) String year) {
List<HistogramVO> histogramVOS = indexService.overallDepartmentStatistics(year);
return Result.OK(histogramVOS);
}
jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
+12 -7
View File
@@ -60,8 +60,10 @@ public class IndexService {
}
public List<LineChartListVO> lineChartList() {
String year = String.valueOf(DateUtil.year(new DateTime()));
public List<LineChartListVO> lineChartList(String year) {
if(StringUtils.isBlank(year)){
year = String.valueOf(DateUtil.year(new DateTime()));
}
AllProjectStatisticsSearch allProjectStatisticsSearch = new AllProjectStatisticsSearch();
allProjectStatisticsSearch.setPaymentYear(year);
List<AllProjectStatistics> list = payWorkingGroupService.queryListAllProjectMoney(allProjectStatisticsSearch, null);
@@ -140,8 +142,10 @@ public class IndexService {
return lineChartVO;
}
public List<LineChartListVO> cumulativeGraphList() {
String year = String.valueOf(DateUtil.year(new DateTime()));
public List<LineChartListVO> cumulativeGraphList(String year) {
if(StringUtils.isBlank(year)){
year = String.valueOf(DateUtil.year(new DateTime()));
}
AllProjectStatisticsSearch allProjectStatisticsSearch = new AllProjectStatisticsSearch();
allProjectStatisticsSearch.setPaymentYear(year);
List<AllProjectStatistics> list = payWorkingGroupService.cumulativeListAllProjectMoney(allProjectStatisticsSearch);
@@ -189,9 +193,10 @@ public class IndexService {
return list;
}
public List<HistogramVO> overallDepartmentStatistics() {
String year = String.valueOf(DateUtil.year(new DateTime()));
public List<HistogramVO> overallDepartmentStatistics(String year) {
if(StringUtils.isBlank(year)){
year = String.valueOf(DateUtil.year(new DateTime()));
}
List<DepartStatistics> records = payWorkingGroupMapper.overallDepartmentStatistics(year);
List<DepartStatistics> all = payWorkingGroupMapper.allDepartmentStatistics(year);
for (DepartStatistics a : all) {