From ed04c168dd7a6d2ebfcae2c6d5c17867b736cf41 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Fri, 16 Jun 2023 10:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E9=A1=B9=E7=9B=AE=EF=BC=9A?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=BB=9F=E8=AE=A1=E8=BF=94=E5=9B=9E=E6=A8=A1?=
 =?UTF-8?q?=E6=8B=9F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcEventServiceImpl.java      | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index a4a66d338b..92094e8723 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -1973,15 +1973,18 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 erDto.setHongDeng(79);
                 erDto.setHuangDeng(39);
                 erDto.setLanDeng(1674);
-                EventRateResultDTO.Category category = new EventRateResultDTO.Category();
                 Integer[] rate = new Integer[]{338, 151, 31, 526, 448, 161, 93, 54};
-                for (int i = 0; i < map.keySet().size(); i++) {
-                    int flag = i;
-                    map.keySet().forEach(key -> {
-                        category.setCode(key);
-                        category.setName(map.get(key));
-                        category.setValue(rate[flag]);
-                    });
+                int flag = 0;
+                for (String key : map.keySet()) {
+                    EventRateResultDTO.Category category = new EventRateResultDTO.Category();
+                    category.setCode(key);
+                    category.setName(map.get(key));
+                    category.setValue(rate[flag]);
+                    if (flag == 7) {
+                        flag = 0;
+                    } else {
+                        flag += flag + 1;
+                    }
                 }
             }
         }
@@ -2000,12 +2003,12 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 total = eventType.equals("0") ? dto.getJiSuJiBan() : eventType.equals("1") ?
                         dto.getZhiTongLianBan() : dto.getWangGeHua();
             }
-            if(dto.getJiSuJiBan() < 406){
+            if (dto.getJiSuJiBan() < 406) {
                 dto.setJiSuJiBan(406);
                 dto.setZhiTongLianBan(72);
                 dto.setWangGeHua(1320);
             }
-            if(StringUtils.isEmpty(eventType)){
+            if (StringUtils.isEmpty(eventType)) {
                 dto.setYiJieAn(1195);
                 dto.setYiJieAnRate(0.67);
                 dto.setGuiDang(485);
@@ -2015,7 +2018,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 dto.setChuLiZhong(39);
                 dto.setChuLiZhongRate(0.02);
             }
-            if(!StringUtils.isEmpty(eventType) && eventType.equals("0")){
+            if (!StringUtils.isEmpty(eventType) && eventType.equals("0")) {
                 dto.setYiJieAn(99);
                 dto.setYiJieAnRate(0.23);
                 dto.setGuiDang(313);
@@ -2025,7 +2028,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 dto.setChuLiZhong(0);
                 dto.setChuLiZhongRate(0.0);
             }
-            if(!StringUtils.isEmpty(eventType) && eventType.equals("1")){
+            if (!StringUtils.isEmpty(eventType) && eventType.equals("1")) {
                 dto.setYiJieAn(20);
                 dto.setYiJieAnRate(0.28);
                 dto.setGuiDang(52);
@@ -2035,7 +2038,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 dto.setChuLiZhong(0);
                 dto.setChuLiZhongRate(0.0);
             }
-            if(!StringUtils.isEmpty(eventType) && eventType.equals("2")){
+            if (!StringUtils.isEmpty(eventType) && eventType.equals("2")) {
                 dto.setYiJieAn(1082);
                 dto.setYiJieAnRate(0.82);
                 dto.setGuiDang(120);
@@ -2133,8 +2136,8 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     }
 
     @Override
-    public List<IcEventResultDTO> getEventsByStaffId(String staffId,String status) {
-        return baseDao.getEventsByStaffId(staffId,status);
+    public List<IcEventResultDTO> getEventsByStaffId(String staffId, String status) {
+        return baseDao.getEventsByStaffId(staffId, status);
     }
 
     /**