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

全所统计

Browse Source
This commit is contained in:
zhangqinlin
2021-09-26 11:34:35 +08:00
parent 813f5d6291
commit c41351e638
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/FirstPageStatisticsController.java
+18 -13
View File
@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -33,32 +35,35 @@ public class FirstPageStatisticsController {
List<PayWorkingGroupStatistics> pageList2 = payWorkingGroupService.queryPageListForStatisticsFirstPage(); List<PayWorkingGroupStatistics> pageList2 = payWorkingGroupService.queryPageListForStatisticsFirstPage();
List<CompanyComeMoneyList> pageList3 = payWorkingGroupService.queryPageListForCompanyFirstPage(); List<CompanyComeMoneyList> pageList3 = payWorkingGroupService.queryPageListForCompanyFirstPage();
List<DepartStatistics> pageList4 = payWorkingGroupService.queryPageListForDepartFirstPage(); List<DepartStatistics> pageList4 = payWorkingGroupService.queryPageListForDepartFirstPage();
ArrayList<PrincipalPeopleList> list = new ArrayList<>();
for(PrincipalPeopleList s: pageList){ for(PrincipalPeopleList s: pageList){
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) { if(!(s.getComeAllMoney()== null || s.getComeAllMoney().equals("")|| s.getComeAllMoney().equals("0") )) {
s.setComeAllMoney("0.00"); list.add(s);
} }
} }
ArrayList<PayWorkingGroupStatistics> list2 = new ArrayList<>();
for(PayWorkingGroupStatistics s: pageList2){ for(PayWorkingGroupStatistics s: pageList2){
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) { if(!(s.getComeAllMoney()== null || s.getComeAllMoney().equals("")|| s.getComeAllMoney().equals("0") )) {
s.setComeAllMoney("0.00"); list2.add(s);
} }
} }
ArrayList<CompanyComeMoneyList> list3 = new ArrayList<>();
for(CompanyComeMoneyList s: pageList3){ for(CompanyComeMoneyList s: pageList3){
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) { if(!(s.getComeAllMoney()== null || s.getComeAllMoney().equals("")|| s.getComeAllMoney().equals("0") ) ){
s.setComeAllMoney("0.00"); list3.add(s);
} }
} }
ArrayList<DepartStatistics> list4 = new ArrayList<>();
for(DepartStatistics s: pageList4){ for(DepartStatistics s: pageList4){
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) { if(!(s.getComeAllMoney()== null || s.getComeAllMoney().equals("")|| s.getComeAllMoney().equals("0") ) ){
s.setComeAllMoney("0.00"); list4.add(s);
} }
} }
HashMap<String, Object> hashMap = new HashMap<>(); HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("principalPeople",pageList); hashMap.put("principalPeople",list);
hashMap.put("payWorkingGroup",pageList2); hashMap.put("payWorkingGroup",list2);
hashMap.put("company",pageList3); hashMap.put("company",list3);
hashMap.put("depart",pageList4); hashMap.put("depart",list4);
return Result.OK(hashMap); return Result.OK(hashMap);
} }
} }