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

fix bug:分标委添加成员

Browse Source
This commit is contained in:
zhangqinlin
2021-10-15 11:41:08 +08:00
parent cdcb65cb03
commit e8b7ba5ee5
14 changed files with 57 additions and 312 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
+9 -9
View File
@@ -104,15 +104,15 @@ public class AllProjectStatisticsController {
allProjectStatisticsSearch.setYear(year);
}
Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageList3(page,allProjectStatisticsSearch, idList );
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageList(page,allProjectStatisticsSearch, idList );
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sum2 =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;
sum2 = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
}
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
if (pageList.getRecords() != null) {
for(AllProjectStatistics s: pageList.getRecords()){
String key = String.valueOf(s.getChargeUse());
@@ -131,7 +131,7 @@ public class AllProjectStatisticsController {
}
hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
hashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));
hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
hashMap.put("pageList",pageList);
return Result.OK(hashMap);
@@ -183,12 +183,12 @@ public class AllProjectStatisticsController {
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sum2 =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;
sum2 = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
}
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
if (pageList.getRecords() != null) {
for(AllProjectStatistics s: pageList.getRecords()){
String key = String.valueOf(s.getChargeUse());
@@ -207,7 +207,7 @@ public class AllProjectStatisticsController {
}
hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
hashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));
hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
hashMap.put("pageList",pageList);
return Result.OK(hashMap);
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+8 -8
View File
@@ -95,10 +95,10 @@ public class CompanyComeMoneyStatisticsController {
IPage<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,idList);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sum2 =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;
sum2 = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).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(CompanyComeMoneyList s: pageList.getRecords()){
@@ -110,9 +110,9 @@ public class CompanyComeMoneyStatisticsController {
}
}
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
hashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));
hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
hashMap.put("pageList",pageList);
return Result.OK(hashMap);
@@ -164,12 +164,12 @@ public class CompanyComeMoneyStatisticsController {
IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sum2 =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;
sum2 = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
}
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
for(CompanyComeMoneyDetail s: pageList.getRecords()){
String key = String.valueOf(s.getChargeUse());
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
@@ -185,7 +185,7 @@ public class CompanyComeMoneyStatisticsController {
}
}
hashMap.put("sumOfMoney", sum == 0.0 ? sum : df.format(sum));
hashMap.put("sumOfReallyMoney", sum2 == 0.0 ? sum2 : df.format(sum2));
hashMap.put("sumOfReallyMoney", sumTwo == 0.0 ? sumTwo : df.format(sumTwo));
hashMap.put("pageList", pageList);
return Result.OK(hashMap);
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
+8 -8
View File
@@ -110,10 +110,10 @@ public class PayWorkingGroupStatisticsController {
//计算应收和实收总金额
double sum=0;
double sum2 =0;
double sumTwo =0;
if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
sum = records.stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0.00" : t.getAllMoney())).sum();
sum2 = records.stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.00" : t.getComeAllMoney())).sum();
sumTwo = records.stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.00" : t.getComeAllMoney())).sum();
}
//处理为空数据为0
for(PayWorkingGroupStatistics s: pageList.getRecords()){
@@ -128,10 +128,10 @@ public class PayWorkingGroupStatisticsController {
}
}
HashMap<String, Object> objectObjectHashMap = new HashMap<>();
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
objectObjectHashMap.put("pageList",pageList.setRecords(records));
objectObjectHashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
objectObjectHashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));
objectObjectHashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
return Result.OK(objectObjectHashMap);
}
@@ -215,13 +215,13 @@ public class PayWorkingGroupStatisticsController {
}
IPage<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.queryPageList2(page, payWorkingGroupSubletSearch,id);
double sum=0;
double sum2 =0;
double sumTwo =0;
if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
sum = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0.0" : t.getAllMoney())).sum();
sum2 = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.0" : t.getComeAllMoney())).sum();
sumTwo = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.0" : t.getComeAllMoney())).sum();
}
HashMap<String, Object> hashMap = new HashMap<>();
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
// 转义来款用途
for(PayWorkGroupSubletStatistics s: pageList.getRecords()){
String key = String.valueOf(s.getChargeUse());
@@ -239,7 +239,7 @@ for(PayWorkGroupSubletStatistics s: pageList.getRecords()){
hashMap.put("pageList",pageList);
hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
hashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));
hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
return Result.OK(hashMap);
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+8 -8
View File
@@ -97,10 +97,10 @@ public class PrincipalPeopleStatisticsController {
IPage<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipal(page,principalPeopleSearch,idList);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sum2 =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;
sum2 = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).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: Objects.requireNonNull(pageList.getRecords())) {
@@ -114,9 +114,9 @@ public class PrincipalPeopleStatisticsController {
s.setFinishRate("0.00%");
}
}
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
hashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));
hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
hashMap.put("pageList",pageList);
return Result.OK(hashMap);
@@ -145,12 +145,12 @@ public class PrincipalPeopleStatisticsController {
IPage<PrincipalPeopleDetail> pageList = payWorkingGroupService.queryPageListForPrincipalDetail(page, principalPeopleDetailSearch);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sum2 =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;
sum2 = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
}
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
for(PrincipalPeopleDetail s: pageList.getRecords()){
String key = String.valueOf(s.getChargeUse());
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
@@ -167,7 +167,7 @@ public class PrincipalPeopleStatisticsController {
}
hashMap.put("sumOfMoney", sum == 0.0 ? sum : df.format(sum));
hashMap.put("sumOfReallyMoney", sum2 == 0.0 ? sum2 : df.format(sum2));
hashMap.put("sumOfReallyMoney", sumTwo == 0.0 ? sumTwo : df.format(sumTwo));
hashMap.put("pageList", pageList);
return Result.OK(hashMap);