Browse Source

公出月份统计

anderx 9 months ago
parent
commit
25a32afa42

+ 19 - 14
src/main/java/com/goafanti/admin/service/impl/AdminStatisticsServiceImpl.java

@@ -551,9 +551,8 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
                 a.setId(e.getAid());
                 a.setDate(e.getReleaseStart());
                 a.setDuration(e.getDuration());
-                Admin admin = adminMapper.queryById(e.getAid());
-                a.setName(admin.getName());
-                System.out.println(a);
+
+                a.setName(getAdminName(e.getAid()));
                 list.add(a);
             }else if(daysBetween>0){
                 double v = e.getDuration() / daysBetween;
@@ -563,9 +562,7 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
                     LocalDate localDate1 = e.getReleaseStart().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusDays(i);
                     a.setDate(Date.from(localDate1.atStartOfDay(ZoneId.systemDefault()).toInstant()));
                     a.setDuration(v);
-                    Admin admin = adminMapper.queryById(e.getAid());
-                    a.setName(admin.getName());
-                    System.out.println(a);
+                    a.setName(getAdminName(e.getAid()));
                     list.add(a);
                 }
             }
@@ -578,6 +575,7 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
             BigDecimal duration = BigDecimal.valueOf(e.getDuration()); // 假设 AdminStatisticsBo 有一个 getCallDurationSum() 方法
             if(!nameMap.containsKey(id)){
                 String name = e.getName();
+
                 nameMap.put(id, name);
             }
             if (durationMap.containsKey(id)) {
@@ -595,6 +593,20 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
         return map;
     }
 
+    private String getAdminName(String aid) {
+        Admin admin = adminMapper.queryById(aid);
+        String name = admin.getName();
+        // 去掉括号及其内部的内容
+        if (name.contains("(")){
+            int index = name.indexOf('(');
+            name = name.substring(0, index);
+        }else if (name.contains("(")){
+            int index = name.indexOf('(');
+            name = name.substring(0, index);
+        }
+        return name;
+    }
+
 
     public List<AdminPublicDuration>  sumDurationsById(List<AdminPublicDuration> adminPublicDurations) {
         Map<String, AdminPublicDuration> durationMap = new HashMap<>();
@@ -602,14 +614,7 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
         for (AdminPublicDuration adminPublicDuration : adminPublicDurations) {
             String id = adminPublicDuration.getId();
             String name = adminPublicDuration.getName();
-            // 去掉括号及其内部的内容
-            if (name.contains("(")){
-                int index = name.indexOf('(');
-                name = name.substring(0, index);
-            }else if (name.contains("(")){
-                int index = name.indexOf('(');
-                name = name.substring(0, index);
-            }
+
 
 
             double duration = adminPublicDuration.getDuration();