工作台，考勤情况需求变更功能开发

duty-service/src/main/java/cn/com/taiji/duty/model/AdminCheck.java

@@ -31,4 +31,10 @@ public class AdminCheck implements Serializable {
 	@ApiModelProperty("状态")
 	private String status;
 
+	@ApiModelProperty("正常数量")
+	private String zcNumber;
+
+	@ApiModelProperty("异常数量")
+	private String ycNumber;
+
 }

duty-service/src/main/resources/application.yml

@@ -11,6 +11,13 @@ spring:
       max-request-size: 200MB
       # 上传文件临时目录自定义
       location: /home/duty/upload_tmp
+  task:
+    scheduling:
+      pool:
+        # 最大线程数，默认是 1
+        size: 10
+      # 线程名称前缀，默认是 scheduling-
+      # thread-name-prefix: foxScheduling-
 
 #文件上传根路径
 file:

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

@@ -151,38 +151,33 @@
         </if>
     </select>
     <select id="queryAdminCheck" resultType="AdminCheck">
-        select t.unit_name as name,t.unit_abbreviation as abbreviation,'缺勤' as status,COUNT(1) as number
+        select a.*,ifnull(sum(case when a.status = '1' then a.number end),0) as zcNumber,ifnull(sum(case when a.status = '2' then a.number end),0) as ycNumber
         from (
-                 select unit_name,unit_abbreviation,DATE_FORMAT(sign_time,'%Y-%m-%d'),dept_id,count(*) as num from duty_sign_in_record
-                 where `status` = '4'
+            select t.dept_id,t.unit_name as name,t.unit_abbreviation as abbreviation,'2' as status,COUNT(1) as number
+            from (
+                select unit_name,unit_abbreviation,DATE_FORMAT(sign_time,'%Y-%m-%d'),dept_id,count(*) as num from duty_sign_in_record
+                where `status` != '1'
                     <if test="startTime != null and endTime != null">
                         and (DATE_FORMAT(sign_time,'%Y-%m-%d') between #{startTime} and #{endTime})
                     </if>
-                 GROUP BY `status`,dept_id,unit_name,DATE_FORMAT(time,'%Y-%m-%d')
-                 HAVING num = 2
-             ) t
-        GROUP BY t.dept_id
-        UNION
-        select t.unit_name as name,t.unit_abbreviation as abbreviation,'缺卡' as status,COUNT(1) as number
-        from (
-                 select unit_name,unit_abbreviation,DATE_FORMAT(sign_time,'%Y-%m-%d'),dept_id,count(*) as num from duty_sign_in_record
-                 where `status` = '4'
+                GROUP BY dept_id,DATE_FORMAT(sign_time,'%Y-%m-%d')
+            ) t
+            GROUP BY t.dept_id
+            UNION
+            select t.dept_id,t.unit_name as name,t.unit_abbreviation as abbreviation,'1' as status,COUNT(1) as number
+            from (
+                select unit_name,unit_abbreviation,DATE_FORMAT(sign_time,'%Y-%m-%d'),dept_id,count(*) as num from duty_sign_in_record
+                where `status` = '1'
                     <if test="startTime != null and endTime != null">
                         and (DATE_FORMAT(sign_time,'%Y-%m-%d') between #{startTime} and #{endTime})
                     </if>
-                 GROUP BY `status`,dept_id,unit_name,DATE_FORMAT(time,'%Y-%m-%d')
-                 HAVING num = 1
-             ) t
-        GROUP BY t.dept_id
-        UNION
-        select unit_name as name,unit_abbreviation as abbreviation,(select dict_label from duty_dict_data where dict_type = 'sign_status' and dict_value = `status`) as status,count(*) as number
-        from duty_sign_in_record
-        where `status` != '4'
-        <if test="startTime != null and endTime != null">
-            and (DATE_FORMAT(sign_time,'%Y-%m-%d') between #{startTime} and #{endTime})
-        </if>
-        GROUP BY `status`,dept_id
-        ORDER BY  case status when '缺勤' then 1 when '迟到' then 2 when '早退' then 3 when '缺卡' then 4 else 5 end ASC,CONVERT(name USING GBK) ASC,number DESC
+                GROUP BY dept_id,DATE_FORMAT(sign_time,'%Y-%m-%d')
+                HAVING num = 2
+            ) t
+            GROUP BY t.dept_id
+        ) a
+        GROUP BY a.dept_id
+        ORDER BY a.status desc,CONVERT(a.name USING GBK) ASC
     </select>
     <select id="queryAdminStatisticsDay" resultType="AdminStatisticsDay">
         select