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

update 企业来款统计-分类统计

Browse Source
This commit is contained in:
lijiarao
2024-07-19 19:27:41 +08:00
parent 65fac10f86
commit 1e3ca8738a
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+22 -6
View File
@@ -235,7 +235,8 @@ public class CompanyComeMoneyStatisticsController {
@ApiOperation(value = "企业来款统计-分类统计") @ApiOperation(value = "企业来款统计-分类统计")
@GetMapping(value = "/classification") @GetMapping(value = "/classification")
public Result<?> classification(CompanyComeMoneySearch companyComeMoneySearch, public Result<?> classification(CompanyComeMoneySearch companyComeMoneySearch,
HttpServletResponse response) { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
String chargeCompanyId = companyComeMoneySearch.getChargeCompanyId(); String chargeCompanyId = companyComeMoneySearch.getChargeCompanyId();
List<String> chargeCompanyIds; List<String> chargeCompanyIds;
if (StringUtils.isNotBlank(chargeCompanyId)){ if (StringUtils.isNotBlank(chargeCompanyId)){
@@ -246,9 +247,16 @@ public class CompanyComeMoneyStatisticsController {
chargeCompanyIds = list.stream().map(PayCompanyManagement::getId).collect(Collectors.toList()); chargeCompanyIds = list.stream().map(PayCompanyManagement::getId).collect(Collectors.toList());
companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds);
} }
String year_begin = companyComeMoneySearch.getYear_begin();
String year = companyComeMoneySearch.getYear(); String year_end = companyComeMoneySearch.getYear_end();
List<String> years = StrUtil.split(year, ','); int integer1 = Integer.parseInt(year_begin);
int integer2 = Integer.parseInt(year_end);
int i = integer2 - integer1;
List<String> years = new LinkedList<>();
years.add(year_begin);
for (int i1 = 0; i1 < i; i1++) {
years.add(String.valueOf(integer1+i1));
}
companyComeMoneySearch.setYears(years); companyComeMoneySearch.setYears(years);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
//获取表头 //获取表头
@@ -351,8 +359,16 @@ public class CompanyComeMoneyStatisticsController {
companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds);
} }
String year = companyComeMoneySearch.getYear(); String year_begin = companyComeMoneySearch.getYear_begin();
List<String> years = StrUtil.split(year, ','); String year_end = companyComeMoneySearch.getYear_end();
int integer1 = Integer.parseInt(year_begin);
int integer2 = Integer.parseInt(year_end);
int i = integer2 - integer1;
List<String> years = new LinkedList<>();
years.add(year_begin);
for (int i1 = 0; i1 < i; i1++) {
years.add(String.valueOf(integer1+i1));
}
companyComeMoneySearch.setYears(years); companyComeMoneySearch.setYears(years);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
//获取表头 //获取表头
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java
+5
View File
@@ -24,6 +24,11 @@ public class CompanyComeMoneySearch {
@ApiModelProperty(value = "来款年份") @ApiModelProperty(value = "来款年份")
private String year; private String year;
@ApiModelProperty(value = "来款年份开始")
private String year_begin;
@ApiModelProperty(value = "来款年份结束")
private String year_end;
private List<String> years; private List<String> years;
@ApiModelProperty(value = "应收总金额") @ApiModelProperty(value = "应收总金额")