值班管理员-统计情况统计逻辑修改

duty-service/src/main/java/cn/com/taiji/duty/mapper/DutyStatisticsMapper.java

@@ -29,8 +29,10 @@ public interface DutyStatisticsMapper extends BaseMapper<DutyStatistics> {
 
     String queryRate(@Param("day") String day, @Param("week") String week, @Param("month") String month, @Param("type") String type);
 
+    String queryRateDay(@Param("day") String day, @Param("week") String week, @Param("month") String month, @Param("type") String type);
+
     String queryLogCount(@Param("day") String day, @Param("week") String week, @Param("month") String month, @Param("type") String type);
 
-    String queryWeekStatus(@Param("time") String time);
+    String queryWeekStatus(@Param("deptId") Long deptId, @Param("time") String time);
 
 }

duty-service/src/main/java/cn/com/taiji/duty/service/IDutyStatisticsService.java

@@ -28,8 +28,10 @@ public interface IDutyStatisticsService extends IService<DutyStatistics> {
 
     String queryRate(String day, String week, String month, String type);
 
+    String queryRateDay(String day, String week, String month, String type);
+
     String queryLogCount(String day, String week, String month, String type);
 
-    String queryWeekStatus(String time);
+    String queryWeekStatus(Long deptId, String time);
 
 }

duty-service/src/main/java/cn/com/taiji/duty/service/impl/DutyStatisticsServiceImpl.java

@@ -51,12 +51,17 @@ public class DutyStatisticsServiceImpl extends ServiceImpl<DutyStatisticsMapper,
     }
 
     @Override
+    public String queryRateDay(String day, String week, String month, String type) {
+        return statisticsMapper.queryRateDay(day, week, month, type);
+    }
+
+    @Override
     public String queryLogCount(String day, String week, String month, String type) {
         return statisticsMapper.queryLogCount(day, week, month, type);
     }
 
     @Override
-    public String queryWeekStatus(String time) {
-        return statisticsMapper.queryWeekStatus(time);
+    public String queryWeekStatus(Long deptId, String time) {
+        return statisticsMapper.queryWeekStatus(deptId, time);
     }
 }

duty-service/src/main/java/cn/com/taiji/duty/service/impl/DutyWorkbenchServiceImpl.java

@@ -187,7 +187,7 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
                     list.add(log);
                 });
 
-                weekMap.put(timeVo.getEndTime(),statisticsService.queryWeekStatus(timeVo.getEndTime()));
+                weekMap.put(timeVo.getEndTime(),statisticsService.queryWeekStatus(deptId, timeVo.getEndTime()));
             });
 
             checkCalender.setDateList(list);
@@ -299,10 +299,10 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             int count = unitMapper.queryCount();
             day.setTotal(String.valueOf(count));
             day.setCqRate(String.format("%.2f", Double.parseDouble(day.getCq())/count*100));
-            day.setDayRate(statisticsService.queryRate(startTime, null, null, "2"));
+            day.setDayRate(statisticsService.queryRateDay(startTime, null, null, "2"));
 
             int endDayOfWeek = localDate.get(WeekFields.ISO.weekOfWeekBasedYear());
-            String rate = statisticsService.queryRate(startTime, null, null, "3");
+            String rate = statisticsService.queryRateDay(startTime, null, null, "3");
             if (StringUtils.isEmpty(rate)) {
                 rate = "0.00";
             }
@@ -383,11 +383,11 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             int count = unitMapper.queryCount();
             day.setTotal(String.valueOf(count));
             day.setCqRate(String.format("%.2f", Double.parseDouble(day.getCq())/count*100));
-            day.setDayRate(statisticsService.queryRate(startTime, null, null, "2"));
+            day.setDayRate(statisticsService.queryRateDay(startTime, null, null, "2"));
 
             int endDayOfWeek = localDate.get(WeekFields.ISO.weekOfWeekBasedYear());
             // day.setWeekRate(statisticsService.queryRate(startTime, null, null, "3"));
-            String rate = statisticsService.queryRate(startTime, null, null, "3");
+            String rate = statisticsService.queryRateDay(startTime, null, null, "3");
             if (StringUtils.isEmpty(rate)) {
                 rate = "0.00";
             }

duty-service/src/main/resources/mapper/DutyStatisticsMapper.xml

@@ -108,6 +108,41 @@
                         and `year_month` = #{month}
                     </if>
                 </where>
+                GROUP BY time
+            ) a
+            GROUP BY a.date
+        ) t
+    </select>
+    <select id="queryRateDay" resultType="java.lang.String">
+        select format(t.normal/(t.normal + t.abnormal) * 100,2) as rate
+        from (
+            select ifnull(sum(case when a.status = '1' then 1 end),0) as normal,ifnull(sum(case when a.status = '2' then 1 end),0) as abnormal
+            from (
+                SELECT
+                    <if test="day != null and day != ''">
+                        time AS date,max(status) AS status
+                    </if>
+                    <if test="week != null and week != ''">
+                        week AS date,max(status) AS status
+                    </if>
+                    <if test="month != null and month != ''">
+                        `year_month` AS date,max(status) AS status
+                    </if>
+                FROM duty_statistics
+                <where>
+                    <if test="type != null and type != ''">
+                        and type = #{type}
+                    </if>
+                    <if test="day != null and day != ''">
+                        and time = #{day}
+                    </if>
+                    <if test="week != null and week != ''">
+                        and week = #{week}
+                    </if>
+                    <if test="month != null and month != ''">
+                        and `year_month` = #{month}
+                    </if>
+                </where>
                 <if test="day != null and day != ''">
                     GROUP BY time,dept_id
                 </if>
@@ -150,15 +185,7 @@
                     and `year_month` = #{month}
                 </if>
             </where>
-            <if test="day != null and day != ''">
-                GROUP BY time,dept_id
-            </if>
-            <if test="week != null and week != ''">
-                GROUP BY WEEK,dept_id
-            </if>
-            <if test="month != null and month != ''">
-                GROUP BY `year_month`,dept_id
-            </if>
+            GROUP BY time
         ) a
         GROUP BY a.date
     </select>
@@ -168,6 +195,9 @@
             SELECT time AS date,max(status) AS status
             FROM duty_statistics
             where type = '3'
+            <if test="deptId != null">
+                and dept_id = #{deptId}
+            </if>
             <if test="time != null and time != ''">
                 and time = #{time}
             </if>