工作台，统计逻辑修改

duty-service/src/main/java/cn/com/taiji/duty/controller/DutyDictDataController.java

@@ -117,6 +117,13 @@ public class DutyDictDataController {
         if (one != null && one.getId().longValue() != dict.getId().longValue()) {
             return AjaxResult.error("字典值："+dict.getDictValue()+"已存在！");
         }
+        List<DutyDictData> list = dictDataService.list(new LambdaQueryWrapper<DutyDictData>()
+                .eq(DutyDictData::getDictType, dict.getDictType())
+                .eq(DutyDictData::getDictSort, dict.getDictSort())
+                .ne(DutyDictData::getId, dict.getId()));
+        if (list != null && list.size() > 0) {
+            return AjaxResult.error("顺序值："+dict.getDictSort()+"已存在！");
+        }
         // dict.setUpdateBy(getUsername());
         return dictDataService.updateDictData(dict) > 0 ? AjaxResult.success() : AjaxResult.error();
     }

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

@@ -36,7 +36,7 @@ public interface DutySignInRecordMapper extends BaseMapper<DutySignInRecord> {
 
     long queryCount(@Param("deptId") Long deptId, @Param("time") String time);
 
-    List<AdminCheck> queryAdminCheck( @Param("startTime") String startTime, @Param("endTime") String endTime);
+    List<AdminCheck> queryAdminCheck( @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("type") String type);
 
     AdminStatisticsDay queryAdminStatisticsDay(@Param("startTime") String startTime, @Param("endTime") String endTime);
 

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

@@ -29,4 +29,6 @@ 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 queryLogCount(@Param("day") String day, @Param("week") String week, @Param("month") String month);
+
 }

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

@@ -27,4 +27,6 @@ public interface IDutyStatisticsService extends IService<DutyStatistics> {
 
     String queryRate(String day, String week, String month, String type);
 
+    String queryLogCount(String day, String week, String month);
+
 }

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

@@ -48,4 +48,9 @@ public class DutyStatisticsServiceImpl extends ServiceImpl<DutyStatisticsMapper,
     public String queryRate(String day, String week, String month, String type) {
         return statisticsMapper.queryRate(day, week, month, type);
     }
+
+    @Override
+    public String queryLogCount(String day, String week, String month) {
+        return statisticsMapper.queryLogCount(day, week, month);
+    }
 }

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

@@ -165,12 +165,8 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
 
             List<TimeVo> times = vo.getTimes();
             times.forEach(timeVo -> {
-                List<DutyStatistics> statisticsList;
-                if (StringUtils.isNull(deptId)) {
-                    statisticsList = statisticsService.queryByTimes(null, timeVo.getBeginTime(), timeVo.getEndTime());
-                } else {
-                    statisticsList = statisticsService.queryByTimes(deptId, timeVo.getBeginTime(), timeVo.getEndTime());
-                }
+                List<DutyStatistics> statisticsList = statisticsService.queryByTimes(deptId, timeVo.getBeginTime(), timeVo.getEndTime());
+
                 LocalDate sTime = LocalDate.parse(timeVo.getBeginTime());
                 LocalDate eTime = LocalDate.parse(timeVo.getEndTime());
                 List<String> strings = collectLocalDates(sTime, eTime);
@@ -260,7 +256,7 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             endTime = localDate.with(TemporalAdjusters.lastDayOfMonth()).format(formatter);
         }
         // AdminCheck check = signInRecordMapper.queryAdminCheck(startTime, endTime);
-        return signInRecordMapper.queryAdminCheck(startTime, endTime);
+        return signInRecordMapper.queryAdminCheck(startTime, endTime,type);
     }
 
     @Override
@@ -300,11 +296,15 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             AdminStatisticsDay day = signInRecordMapper.queryAdminStatisticsDay(startTime, endTime);
             int count = unitMapper.queryCount();
             day.setTotal(String.valueOf(count));
-            day.setCqRate(String.valueOf(Integer.parseInt(day.getCq())/count*100));
+            day.setCqRate(String.format("%.2f", Double.parseDouble(day.getCq())/count*100));
             day.setDayRate(statisticsService.queryRate(startTime, null, null, "2"));
 
             int endDayOfWeek = localDate.get(WeekFields.ISO.weekOfWeekBasedYear());
-            day.setWeekRate(statisticsService.queryRate(null, String.valueOf(endDayOfWeek), null, "3"));
+            String rate = statisticsService.queryRate(startTime, null, null, "3");
+            if (StringUtils.isEmpty(rate)) {
+                rate = "0.00";
+            }
+            day.setWeekRate(rate);
             statistics.setDay(day);
         } else if ("2".equals(type)) {
             LocalDate localDate = LocalDate.now();
@@ -314,15 +314,28 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             AdminStatisticsWeek week = new AdminStatisticsWeek();
             week.setQq(day.getCq());
             int weekNum = localDate.get(ChronoField.DAY_OF_WEEK);
+            if (weekNum == 6) {
+                weekNum = 1;
+            } else if (weekNum == 7) {
+                weekNum = 2;
+            } else {
+                weekNum += 2;
+            }
 
             week.setTotal(String.valueOf(weekNum));
-            week.setCqRate(String.valueOf(Integer.parseInt(day.getCq())/weekNum*100));
+            week.setCqRate(String.format("%.2f", Double.parseDouble(day.getCq())/weekNum*100));
 
             int endDayOfWeek = localDate.get(WeekFields.ISO.weekOfWeekBasedYear());
-            week.setDayRate(statisticsService.queryRate(null, String.valueOf(endDayOfWeek), null, "2"));
+            week.setRz(statisticsService.queryLogCount(null, String.valueOf(endDayOfWeek), null));
 
-            week.setWeekRate(statisticsService.queryRate(null, String.valueOf(endDayOfWeek), null, "3"));
+            week.setDayRate(statisticsService.queryRate(null, String.valueOf(endDayOfWeek), null, "2"));
 
+            // week.setWeekRate(statisticsService.queryRate(null, String.valueOf(endDayOfWeek), null, "3"));
+            String rate = statisticsService.queryRate(null, String.valueOf(endDayOfWeek), null, "3");
+            if (StringUtils.isEmpty(rate)) {
+                rate = "0.00";
+            }
+            week.setWeekRate(rate);
             statistics.setWeek(week);
         } else if ("3".equals(type)) {
             LocalDate localDate = LocalDate.now();
@@ -333,12 +346,18 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             month.setQq(day.getCq());
             int monthNum = localDate.get(ChronoField.DAY_OF_MONTH);
             month.setTotal(String.valueOf(monthNum));
-            month.setCqRate(String.valueOf(Integer.parseInt(day.getCq())/monthNum*100));
+            month.setCqRate(String.format("%.2f", Double.parseDouble(day.getCq())/monthNum*100));
             DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM");
             String yearMonth = localDate.format(df);
+            month.setRz(statisticsService.queryLogCount(null, null, yearMonth));
             month.setDayRate(statisticsService.queryRate(null, null, yearMonth, "2"));
 
-            month.setWeekRate(statisticsService.queryRate(null, null, yearMonth, "3"));
+            // month.setWeekRate(statisticsService.queryRate(null, null, yearMonth, "3"));
+            String rate = statisticsService.queryRate(null, null, yearMonth, "3");
+            if (StringUtils.isEmpty(rate)) {
+                rate = "0.00";
+            }
+            month.setWeekRate(rate);
             statistics.setMonth(month);
         } else if ("4".equals(type)) {
             LocalDate localDate = LocalDate.now().minusDays(1);
@@ -347,11 +366,16 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             AdminStatisticsDay day = signInRecordMapper.queryAdminStatisticsDay(startTime, endTime);
             int count = unitMapper.queryCount();
             day.setTotal(String.valueOf(count));
-            day.setCqRate(String.valueOf(Integer.parseInt(day.getCq())/count*100));
+            day.setCqRate(String.format("%.2f", Double.parseDouble(day.getCq())/count*100));
             day.setDayRate(statisticsService.queryRate(startTime, null, null, "2"));
 
             int endDayOfWeek = localDate.get(WeekFields.ISO.weekOfWeekBasedYear());
-            day.setWeekRate(statisticsService.queryRate(null, String.valueOf(endDayOfWeek), null, "3"));
+            // day.setWeekRate(statisticsService.queryRate(startTime, null, null, "3"));
+            String rate = statisticsService.queryRate(startTime, null, null, "3");
+            if (StringUtils.isEmpty(rate)) {
+                rate = "0.00";
+            }
+            day.setWeekRate(rate);
             statistics.setDay(day);
         } else if ("5".equals(type)) {
             LocalDate localDate = LocalDate.now().minusWeeks(1);
@@ -361,11 +385,17 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             AdminStatisticsWeek week = new AdminStatisticsWeek();
             week.setQq(day.getCq());
             week.setTotal("7");
-            week.setCqRate(String.valueOf(Integer.parseInt(day.getCq())/7*100));
+            week.setCqRate(String.format("%.2f", Double.parseDouble(day.getCq())/7*100));
             int endDayOfWeek = localDate.get(WeekFields.ISO.weekOfWeekBasedYear());
+            week.setRz(statisticsService.queryLogCount(null, String.valueOf(endDayOfWeek), null));
             week.setDayRate(statisticsService.queryRate(null, String.valueOf(endDayOfWeek), null, "2"));
 
-            week.setWeekRate(statisticsService.queryRate(null, String.valueOf(endDayOfWeek), null, "3"));
+            // week.setWeekRate(statisticsService.queryRate(null, String.valueOf(endDayOfWeek), null, "3"));
+            String rate = statisticsService.queryRate(null, String.valueOf(endDayOfWeek), null, "3");
+            if (StringUtils.isEmpty(rate)) {
+                rate = "0.00";
+            }
+            week.setWeekRate(rate);
             statistics.setWeek(week);
         } else {
             LocalDate localDate = LocalDate.now().minusMonths(1);
@@ -374,14 +404,20 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             AdminStatisticsDay day = signInRecordMapper.queryAdminStatisticsDay(startTime, endTime);
             AdminStatisticsMonth month = new AdminStatisticsMonth();
             month.setQq(day.getCq());
-            int monthNum = LocalDate.now().lengthOfMonth();
+            int monthNum = localDate.lengthOfMonth();
             month.setTotal(String.valueOf(monthNum));
-            month.setCqRate(String.valueOf(Integer.parseInt(day.getCq())/monthNum*100));
+            month.setCqRate(String.format("%.2f", Double.parseDouble(day.getCq())/monthNum*100));
             DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM");
             String yearMonth = localDate.format(df);
+            month.setRz(statisticsService.queryLogCount(null, null, yearMonth));
             month.setDayRate(statisticsService.queryRate(null, null, yearMonth, "2"));
 
-            month.setWeekRate(statisticsService.queryRate(null, null, yearMonth, "3"));
+            // month.setWeekRate(statisticsService.queryRate(null, null, yearMonth, "3"));
+            String rate = statisticsService.queryRate(null, null, yearMonth, "3");
+            if (StringUtils.isEmpty(rate)) {
+                rate = "0.00";
+            }
+            month.setWeekRate(rate);
             statistics.setMonth(month);
         }
         return statistics;

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

@@ -177,7 +177,13 @@
             GROUP BY t.dept_id
         ) a
         GROUP BY a.dept_id
-        ORDER BY a.status desc,CONVERT(a.name USING GBK) ASC
+        ORDER BY
+        <if test="type != null and type == 'day'">
+            a.status desc,CONVERT(a.name USING GBK) ASC
+        </if>
+        <if test="type != null and type != 'day'">
+            ycNumber desc,zcNumber desc,CONVERT(a.name USING GBK) ASC
+        </if>
     </select>
     <select id="queryAdminStatisticsDay" resultType="AdminStatisticsDay">
         select
@@ -226,6 +232,7 @@
                     <if test="startTime != null and endTime != null">
                         and (DATE_FORMAT(sign_time,'%Y-%m-%d') between #{startTime} and #{endTime})
                     </if>
+                 GROUP BY status
              ) t
     </select>
     <select id="search" resultType="DutySignInRecord">

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

@@ -35,64 +35,128 @@
         ) t
     </select>
     <select id="queryAnalysisInfoByWeeks" resultType="AdminAnalysisInfo">
-        select concat('第',t.date,'周') as date,t.normal,t.abnormal,format(t.normal/(t.normal + t.abnormal) * 100,2) as rate
-        from (
-        select week as date,count(case `status` when '1' then 1 end) as normal,count(case `status` when '2' then 1 end) as abnormal
-        from duty_statistics
-        <where>
-            <if test="type != null and type != ''">
-                and type = #{type}
-            </if>
-            <if test="weeks != null and weeks.size() != 0">
-                and week in
-                <foreach collection="weeks" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-        group by week
+        SELECT concat('第',t.date,'周') as date,t.normal,t.abnormal,format(t.normal/(t.normal + t.abnormal) * 100,2) as rate
+        FROM (
+            select a.date,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 WEEK AS date,dept_id,max(status) AS status FROM duty_statistics
+                <where>
+                    <if test="type != null and type != ''">
+                        and type = #{type}
+                    </if>
+                    <if test="weeks != null and weeks.size() != 0">
+                        and week in
+                        <foreach collection="weeks" open="(" separator="," close=")" item="item">
+                            #{item}
+                        </foreach>
+                    </if>
+                </where>
+                GROUP BY WEEK,dept_id
+            ) a
+            GROUP BY a.date
         ) t
     </select>
     <select id="queryAnalysisInfoByMonths" resultType="AdminAnalysisInfo">
-        select t.*,format(t.normal/(t.normal + t.abnormal) * 100,2) as rate
-        from (
-        select `year_month` as date,count(case `status` when '1' then 1 end) as normal,count(case `status` when '2' then 1 end) as abnormal
-        from duty_statistics
-        <where>
-            <if test="type != null and type != ''">
-                and type = #{type}
-            </if>
-            <if test="months != null and months.size() != 0">
-                and `year_month` in
-                <foreach collection="months" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-        group by `year_month`
+        SELECT t.*,format(t.normal/(t.normal + t.abnormal) * 100,2) as rate
+        FROM (
+            select a.date,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 `year_month` AS date,dept_id,max(status) AS status FROM duty_statistics
+                <where>
+                    <if test="type != null and type != ''">
+                        and type = #{type}
+                    </if>
+                    <if test="months != null and months.size() != 0">
+                        and `year_month` in
+                        <foreach collection="months" open="(" separator="," close=")" item="item">
+                            #{item}
+                        </foreach>
+                    </if>
+                </where>
+                GROUP BY `year_month`,dept_id
+            ) a
+            GROUP BY a.date
         ) t
     </select>
     <select id="queryRate" resultType="java.lang.String">
         select format(t.normal/(t.normal + t.abnormal) * 100,2) as rate
         from (
-        select count(case `status` when '1' then 1 end) as normal,count(case `status` when '2' then 1 end) as abnormal
-        from duty_statistics
-        <where>
-            <if test="type != null and type != ''">
-                and type = #{type}
+            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>
+                <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>
+            ) a
+            GROUP BY a.date
+        ) t
+    </select>
+
+    <select id="queryLogCount" resultType="java.lang.String">
+        select ifnull(sum(case when a.status = '1' then 1 end),0) as normal
+        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 type = 2
+                <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>
             <if test="day != null and day != ''">
-                and time = #{day}
+                GROUP BY time,dept_id
             </if>
             <if test="week != null and week != ''">
-                and week = #{week}
+                GROUP BY WEEK,dept_id
             </if>
             <if test="month != null and month != ''">
-                and `year_month` = #{month}
+                GROUP BY `year_month`,dept_id
             </if>
-        </where>
-        group by `year_month`
-        ) t
+        ) a
+        GROUP BY a.date
     </select>
 
 </mapper>