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

add 统计增加排序功能增加完成

Browse Source 
回显确认金额
This commit is contained in:
lijiarao
2022-06-09 18:28:20 +08:00
parent be734da2a2
commit c03d0234bf
13 changed files with 483 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+4
View File
@@ -95,6 +95,8 @@ public class AllProjectStatisticsController {
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
hashMap.put("pageList", pageList);
return Result.OK(hashMap);
@@ -162,6 +164,8 @@ public class AllProjectStatisticsController {
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
hashMap.put("pageList", pageList);
return Result.OK(hashMap);
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+4
View File
@@ -80,6 +80,8 @@ public class CompanyComeMoneyStatisticsController {
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
hashMap.put("pageList", pageList);
return Result.OK(hashMap);
@@ -128,6 +130,8 @@ public class CompanyComeMoneyStatisticsController {
AllMoney allMoney = payWorkingGroupService.queryPageListForCompanyDetail33(companyComeMoneyDetailSearch, null);
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
hashMap.put("pageList", pageList);
return Result.OK(hashMap);
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
+4
View File
@@ -90,6 +90,8 @@ public class PayWorkingGroupStatisticsController {
hashMap.put("pageList", pageList.setRecords(records));
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
return Result.OK(hashMap);
}
@@ -179,6 +181,8 @@ public class PayWorkingGroupStatisticsController {
hashMap.put("pageList", pageList);
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
return Result.OK(hashMap);
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+4 -6
View File
@@ -98,12 +98,6 @@ public class PrincipalPeopleStatisticsController {
AllMoney allMoney = payWorkingGroupService.queryPageListForPrincipal33(principalPeopleSearch, idList);
HashMap<String, Object> hashMap = new HashMap<>();
// double sum=0;
// double sumTwo =0;
// if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
// sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
// sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
// }
//处理为空数据为0
for (PrincipalPeopleList s : pageList.getRecords()) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
@@ -119,6 +113,8 @@ public class PrincipalPeopleStatisticsController {
DecimalFormat df = new DecimalFormat("#,##0.00");
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
hashMap.put("pageList", pageList);
return Result.OK(hashMap);
@@ -158,6 +154,8 @@ public class PrincipalPeopleStatisticsController {
}
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
hashMap.put("pageList", pageList);
return Result.OK(hashMap);
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllMoney.java
+2
View File
@@ -12,4 +12,6 @@ public class AllMoney {
private String comeAllMoney;
private String billMoney;
private String confirmAmount;
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java
+4
View File
@@ -34,6 +34,10 @@ public class AllProjectStatistics {
@ApiModelProperty(value = "开票金额")
private String billMoney;
@Excel(name = "确认金额", width = 15)
@ApiModelProperty(value = "确认金额")
private String confirmAmount;
@ApiModelProperty(value = "来款用途编码")
private String chargeUse;
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java
+8
View File
@@ -26,6 +26,14 @@ public class CompanyComeMoneyDetail {
@ApiModelProperty(value = "实收金额")
private String comeAllMoney;
@Excel(name = "开票金额", width = 15)
@ApiModelProperty(value = "开票金额")
private String billMoney;
@Excel(name = "确认金额", width = 15)
@ApiModelProperty(value = "确认金额")
private String confirmAmount;
@ApiModelProperty(value = "来款用途编码")
private String chargeUse;
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java
+9
View File
@@ -25,6 +25,15 @@ public class CompanyComeMoneyList {
@Excel(name = "实收总金额", width = 15)
@ApiModelProperty(value = "实收总金额")
private String comeAllMoney;
@Excel(name = "开票金额", width = 15)
@ApiModelProperty(value = "开票金额")
private String billMoney;
@Excel(name = "确认金额", width = 15)
@ApiModelProperty(value = "确认金额")
private String confirmAmount;
@Excel(name = "到账率", width = 15)
@ApiModelProperty(value = "到账率")
private String finishRate;
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java
+4
View File
@@ -19,5 +19,9 @@ public class DepartStatistics {
@ApiModelProperty(value = "实收总金额")
private String comeAllMoney;
@Excel(name = "开票金额", width = 15)
@ApiModelProperty(value = "开票金额")
private String billMoney;
private String departName;
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleList.java
+8
View File
@@ -26,6 +26,14 @@ public class PrincipalPeopleList {
@ApiModelProperty(value = "实收总金额")
private String comeAllMoney;
@Excel(name = "开票金额", width = 15)
@ApiModelProperty(value = "开票金额")
private String billMoney;
@Excel(name = "确认金额", width = 15)
@ApiModelProperty(value = "确认金额")
private String confirmAmount;
@Excel(name = "个人完成率", width = 15)
@ApiModelProperty(value = "个人完成率")
private String finishRate;