From c41351e6389728be4ef1d8453c3f6a414b6712c3 Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Sun, 26 Sep 2021 11:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=89=80=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FirstPageStatisticsController.java        | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/FirstPageStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/FirstPageStatisticsController.java
index cedb027b..ebdc20d6 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/FirstPageStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/FirstPageStatisticsController.java
@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -33,32 +35,35 @@ public class FirstPageStatisticsController {
         List<PayWorkingGroupStatistics> pageList2 = payWorkingGroupService.queryPageListForStatisticsFirstPage();
         List<CompanyComeMoneyList> pageList3 = payWorkingGroupService.queryPageListForCompanyFirstPage();
         List<DepartStatistics> pageList4 = payWorkingGroupService.queryPageListForDepartFirstPage();
+        ArrayList<PrincipalPeopleList> list = new ArrayList<>();
         for(PrincipalPeopleList s: pageList){
-            if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
-                s.setComeAllMoney("0.00");
+            if(!(s.getComeAllMoney()== null || s.getComeAllMoney().equals("")|| s.getComeAllMoney().equals("0") )) {
+                list.add(s);
             }
         }
+        ArrayList<PayWorkingGroupStatistics> list2 = new ArrayList<>();
         for(PayWorkingGroupStatistics s: pageList2){
-            if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
-                s.setComeAllMoney("0.00");
+            if(!(s.getComeAllMoney()== null || s.getComeAllMoney().equals("")|| s.getComeAllMoney().equals("0") )) {
+                list2.add(s);
             }
         }
+        ArrayList<CompanyComeMoneyList> list3 = new ArrayList<>();
         for(CompanyComeMoneyList s: pageList3){
-            if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
-                s.setComeAllMoney("0.00");
+            if(!(s.getComeAllMoney()== null || s.getComeAllMoney().equals("")|| s.getComeAllMoney().equals("0") ) ){
+               list3.add(s);
             }
         }
+        ArrayList<DepartStatistics> list4 = new ArrayList<>();
         for(DepartStatistics s: pageList4){
-            if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
-                s.setComeAllMoney("0.00");
+            if(!(s.getComeAllMoney()== null || s.getComeAllMoney().equals("")|| s.getComeAllMoney().equals("0") ) ){
+                list4.add(s);
             }
         }
-
         HashMap<String, Object> hashMap = new HashMap<>();
-        hashMap.put("principalPeople",pageList);
-        hashMap.put("payWorkingGroup",pageList2);
-        hashMap.put("company",pageList3);
-        hashMap.put("depart",pageList4);
+        hashMap.put("principalPeople",list);
+        hashMap.put("payWorkingGroup",list2);
+        hashMap.put("company",list3);
+        hashMap.put("depart",list4);
         return Result.OK(hashMap);
     }
 }
\ No newline at end of file