diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java index 8391a207..bd1070e0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.util.RedisUtil; import com.jero.contract.entity.ThereContract; import com.jero.project.entity.PayResearchProject; import com.jero.project.mapper.PayResearchProjectMapper; @@ -69,6 +70,8 @@ public class PayResearchProjectServiceImpl extends ServiceImpl map2 = new HashMap<>(); @@ -224,7 +231,11 @@ public class PayResearchProjectServiceImpl extends ServiceImpl map2 = new HashMap<>(); map2.put("Authorization",access_token); @@ -268,7 +279,11 @@ public class PayResearchProjectServiceImpl extends ServiceImpl map2 = new HashMap<>(); map2.put("Authorization",access_token); @@ -288,20 +303,16 @@ public class PayResearchProjectServiceImpl extends ServiceImpl map = new HashMap<>(); -// map.put("refresh_token",refresh_token); -// String s = JSONObject.toJSONString(map); -// String s1 = HttpUtil.post(URL_REFRESH_TOKEN, s); -// JSONObject jsonObject = JSONObject.parseObject(s1); - - HashMap map2 = new HashMap<>(); map2.put("refresh_token",refresh_token); + //这种方式是表单提交键值对 String post = HttpUtil.post(URL_REFRESH_TOKEN, map2); JSONObject jsonObject = JSONObject.parseObject(post); return jsonObject; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java index a8961a75..4342adc6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java @@ -123,8 +123,8 @@ public class AllProjectStatisticsController { } AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch); - 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("sumOfMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getAllMoney()); + hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)?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",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("sumOfMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getAllMoney()); + hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getComeAllMoney()); hashMap.put("pageList",pageList); return Result.OK(hashMap); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index 62164f6e..1966b072 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -108,8 +108,8 @@ public class CompanyComeMoneyStatisticsController { DecimalFormat df = new DecimalFormat("#,##0.00"); AllMoney allMoney = payWorkingGroupService.queryPageListForCompany33(companyComeMoneySearch,null); - 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("sumOfMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getAllMoney()); + hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getComeAllMoney()); hashMap.put("pageList",pageList); return Result.OK(hashMap); @@ -187,8 +187,8 @@ public class CompanyComeMoneyStatisticsController { } } AllMoney allMoney = payWorkingGroupService.queryPageListForCompanyDetail33(companyComeMoneyDetailSearch,null); - 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("sumOfMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getAllMoney()); + hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getComeAllMoney()); hashMap.put("pageList", pageList); return Result.OK(hashMap); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java index 4dc4fd5a..df7ee2eb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java @@ -119,8 +119,8 @@ public class PayWorkingGroupStatisticsController { HashMap 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()); + hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getAllMoney()); + hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getComeAllMoney()); return Result.OK(hashMap); } @@ -264,8 +264,8 @@ public class PayWorkingGroupStatisticsController { } } hashMap.put("pageList",pageList); - 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("sumOfMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getAllMoney()); + hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getComeAllMoney()); return Result.OK(hashMap); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java index e37ce2a5..049419e6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java @@ -98,12 +98,12 @@ public class PrincipalPeopleStatisticsController { AllMoney allMoney = payWorkingGroupService.queryPageListForPrincipal33(principalPeopleSearch,idList); HashMap 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; - } +// 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("")) { @@ -117,8 +117,8 @@ public class PrincipalPeopleStatisticsController { } } DecimalFormat df = new DecimalFormat("#,##0.00"); - 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("sumOfMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getAllMoney()); + hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getComeAllMoney()); hashMap.put("pageList",pageList); return Result.OK(hashMap); @@ -141,13 +141,13 @@ public class PrincipalPeopleStatisticsController { IPage pageList = payWorkingGroupService.queryPageListForPrincipalDetail(page, principalPeopleDetailSearch); AllMoney allMoney = payWorkingGroupService.queryPageListForPrincipalDetail33(principalPeopleDetailSearch); HashMap 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; - } - DecimalFormat df = new DecimalFormat("#,##0.00"); +// 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; +// } +// 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); @@ -163,8 +163,8 @@ public class PrincipalPeopleStatisticsController { } } - 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("sumOfMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getAllMoney()); + hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getComeAllMoney()); hashMap.put("pageList", pageList); return Result.OK(hashMap); }