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:
zhangqinlin
2022-04-01 18:09:41 +08:00
parent 1ce08f3600
commit a8db9f916b
20 changed files with 982 additions and 109 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
+26 -4
View File
@@ -123,8 +123,8 @@ public class AllProjectStatisticsController {
}
AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch);
hashMap.put("sumOfMoney", allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney",allMoney.getComeAllMoney());
hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
hashMap.put("pageList",pageList);
return Result.OK(hashMap);
@@ -199,8 +199,8 @@ public class AllProjectStatisticsController {
}
AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch);
hashMap.put("sumOfMoney", allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney",allMoney.getComeAllMoney());
hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
hashMap.put("pageList",pageList);
return Result.OK(hashMap);
@@ -257,6 +257,14 @@ public class AllProjectStatisticsController {
String key = String.valueOf(s.getChargeUse());
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
s.setChargeUse_text(payment_charge_use);
//处理为空数据为0
if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
s.setAllMoney("0.00");
}
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
s.setComeAllMoney("0.00");
}
}
}
return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "所领导统计");
@@ -301,6 +309,13 @@ public class AllProjectStatisticsController {
String key = String.valueOf(s.getChargeUse());
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
s.setChargeUse_text(payment_charge_use);
//处理为空数据为0
if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
s.setAllMoney("0.00");
}
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
s.setComeAllMoney("0.00");
}
}
}
return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "所领导统计");
@@ -350,6 +365,13 @@ public class AllProjectStatisticsController {
String key = String.valueOf(s.getChargeUse());
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
s.setChargeUse_text(payment_charge_use);
//处理为空数据为0
if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
s.setAllMoney("0.00");
}
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
s.setComeAllMoney("0.00");
}
}
}
return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "项目来款统计");
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+28 -5
View File
@@ -100,13 +100,16 @@ public class CompanyComeMoneyStatisticsController {
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
s.setComeAllMoney("0.00");
}
if(s.getFinishRate()== null || s.getFinishRate().equals("") ) {
s.setFinishRate("0.00%");
}
}
DecimalFormat df = new DecimalFormat("#,##0.00");
AllMoney allMoney = payWorkingGroupService.queryPageListForCompany33(companyComeMoneySearch,null);
hashMap.put("sumOfMoney",allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", allMoney.getComeAllMoney());
hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
hashMap.put("pageList",pageList);
return Result.OK(hashMap);
@@ -184,8 +187,8 @@ public class CompanyComeMoneyStatisticsController {
}
}
AllMoney allMoney = payWorkingGroupService.queryPageListForCompanyDetail33(companyComeMoneyDetailSearch,null);
hashMap.put("sumOfMoney",allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney",allMoney.getComeAllMoney());
hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
hashMap.put("pageList", pageList);
return Result.OK(hashMap);
}
@@ -225,7 +228,18 @@ public class CompanyComeMoneyStatisticsController {
// }
List<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, null);
//处理为空数据为0
for(CompanyComeMoneyList s: pageList) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
}
if (s.getFinishRate() == null || s.getFinishRate().equals("")) {
s.setFinishRate("0.00%");
}
}
return AmountUtil.exportListXls(pageList, CompanyComeMoneyList.class, "企业来款统计");
}
@@ -271,6 +285,15 @@ public class CompanyComeMoneyStatisticsController {
String key = String.valueOf(s.getChargeUse());
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
s.setChargeUse_text(payment_charge_use);
//处理为空数据为0
for(CompanyComeMoneyDetail ss: pageList) {
if (ss.getAllMoney() == null || ss.getAllMoney().equals("")) {
ss.setAllMoney("0.00");
}
if (ss.getComeAllMoney() == null || ss.getComeAllMoney().equals("")) {
ss.setComeAllMoney("0.00");
}
}
}
return AmountUtil.exportListXls(pageList, CompanyComeMoneyDetail.class, "企业来款详情统计");
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
+30 -23
View File
@@ -14,6 +14,7 @@ import com.jero.project.entity.PayWorkingGroupStatistics;
import com.jero.project.entity.PayWorkingGroupSubletSearch;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.statistics.entity.AllMoney;
import com.jero.util.AmountUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -89,35 +90,38 @@ public class PayWorkingGroupStatisticsController {
IPage<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch,null);
List<PayWorkingGroupStatistics> records = pageList.getRecords();
for (PayWorkingGroupStatistics payWorkingGroupStatistics:records){
if(payWorkingGroupStatistics.getComeAllMoney()==null||payWorkingGroupStatistics.getComeAllMoney()==""){
if(payWorkingGroupStatistics.getComeAllMoney()==null|| payWorkingGroupStatistics.getComeAllMoney().equals("")){
payWorkingGroupStatistics.setComeAllMoney("0.00");
}
}
//计算应收和实收总金额
double sum=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();
sumTwo = records.stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.00" : t.getComeAllMoney())).sum();
}
AllMoney allMoney = payWorkingGroupService.queryPageListForStatistics33(payWorkingGroupSearch,null);
// //计算应收和实收总金额
// double sum=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();
// sumTwo = records.stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.00" : t.getComeAllMoney())).sum();
// }
// DecimalFormat df = new DecimalFormat("#,##0.00");
//处理为空数据为0
for(PayWorkingGroupStatistics s: pageList.getRecords()){
if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
s.setAllMoney("0.00");
}
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ){
s.setComeAllMoney("0.00");
}
if(s.getMoneyRate()== null || s.getMoneyRate().equals("") ) {
s.setMoneyRate("0.00%");
}
}
HashMap<String, Object> objectObjectHashMap = new HashMap<>();
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", sumTwo==0.0?sumTwo:df.format(sumTwo));
return Result.OK(objectObjectHashMap);
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("pageList",pageList.setRecords(records));
hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
return Result.OK(hashMap);
}
/**
@@ -235,12 +239,14 @@ public class PayWorkingGroupStatisticsController {
payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
Page<PayWorkGroupSubletStatistics> page = new Page<>(pageNo, pageSize);
IPage<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.queryPageList2(page, payWorkingGroupSubletSearch,id);
double sum=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();
sumTwo = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.0" : t.getComeAllMoney())).sum();
}
AllMoney allMoney = payWorkingGroupSubItemService.queryPageList233(payWorkingGroupSubletSearch,id);
// double sum=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();
// 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("#,##0.00");
// 转义来款用途
@@ -258,8 +264,8 @@ public class PayWorkingGroupStatisticsController {
}
}
hashMap.put("pageList",pageList);
hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
return Result.OK(hashMap);
}
@@ -301,6 +307,7 @@ public class PayWorkingGroupStatisticsController {
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
}
}
return AmountUtil.exportListXls(pageList, PayWorkGroupSubletStatistics.class, "工作组成员统计");
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+11 -8
View File
@@ -95,7 +95,9 @@ public class PrincipalPeopleStatisticsController {
}
Page<PrincipalPeopleList> page = new Page<>(pageNo, pageSize);
IPage<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipal(page,principalPeopleSearch,idList);
HashMap<String, Object> hashMap = new HashMap<>();
AllMoney allMoney = payWorkingGroupService.queryPageListForPrincipal33(principalPeopleSearch,idList);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sumTwo =0;
if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
@@ -115,8 +117,8 @@ public class PrincipalPeopleStatisticsController {
}
}
DecimalFormat df = new DecimalFormat("#,##0.00");
hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
hashMap.put("pageList",pageList);
return Result.OK(hashMap);
@@ -135,9 +137,10 @@ public class PrincipalPeopleStatisticsController {
public Result<?> listForDetail(PrincipalPeopleDetailSearch principalPeopleDetailSearch,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
Page<PrincipalPeopleDetail> page = new Page<>(pageNo, pageSize);
IPage<PrincipalPeopleDetail> pageList = payWorkingGroupService.queryPageListForPrincipalDetail(page, principalPeopleDetailSearch);
HashMap<String, Object> hashMap = new HashMap<>();
Page<PrincipalPeopleDetail> page = new Page<>(pageNo, pageSize);
IPage<PrincipalPeopleDetail> pageList = payWorkingGroupService.queryPageListForPrincipalDetail(page, principalPeopleDetailSearch);
AllMoney allMoney = payWorkingGroupService.queryPageListForPrincipalDetail33(principalPeopleDetailSearch);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sumTwo =0;
if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
@@ -160,8 +163,8 @@ public class PrincipalPeopleStatisticsController {
}
}
hashMap.put("sumOfMoney", sum == 0.0 ? sum : df.format(sum));
hashMap.put("sumOfReallyMoney", sumTwo == 0.0 ? sumTwo : df.format(sumTwo));
hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
hashMap.put("pageList", pageList);
return Result.OK(hashMap);
}