Merge branch 'master' of http://gitea.biutag.com/police-mailbox/mailbox-boot

mailbox-lan/src/main/resources/mapper/DataScreenMapper.xml

@@ -15,30 +15,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getCompletedRate" resultType="java.util.Map">
-        select  b.second_dept_name name,CONCAT(ROUND(sum(COALESCE(b.completed, 0))*100/count(1),0),'%') rate, SUM(COALESCE(b.completed, 0))   completed,count(1) sum
-        from dept a inner join  mail_mark  b on a.id=b.second_dept_id where a.category='2'   GROUP BY second_dept_name order by rate desc  limit 10
+        select  b.second_dept_name name,CONCAT(ROUND(sum(COALESCE(b.completed, 0))*100/count(1),0),'%') rate,
+                ROUND(sum(COALESCE(b.completed, 0))*100/count(1),0) rateNumber,
+                SUM(COALESCE(b.completed, 0))   completed,count(1) sum
+        from dept a inner join  mail_mark  b on a.id=b.second_dept_id where a.category='2'   GROUP BY second_dept_name order by rateNumber desc  limit 10
     </select>
     <select id="getResolvedRate" resultType="java.util.Map">
-        select  b.second_dept_name name,CONCAT(ROUND(sum(COALESCE(b.resolved, 0))*100/count(1),0),'%') rate,SUM(COALESCE(b.resolved, 0))   resolved,count(1) sum
-        from dept a inner join  mail_mark  b on a.id=b.second_dept_id where a.category='2'   GROUP BY second_dept_name order by rate desc  limit 10
+        select  b.second_dept_name name,CONCAT(ROUND(sum(COALESCE(b.resolved, 0))*100/count(1),0),'%') rate,
+                ROUND(sum(COALESCE(b.resolved, 0))*100/count(1),0) rateNumber,
+                SUM(COALESCE(b.resolved, 0))   resolved,count(1) sum
+        from dept a inner join  mail_mark  b on a.id=b.second_dept_id where a.category='2'   GROUP BY second_dept_name order by rateNumber desc  limit 10
     </select>
     <select id="getSatisfiedRate" resultType="java.util.Map">
-        select  b.second_dept_name name,CONCAT(ROUND(sum(COALESCE(b.satisfied, 0))*100/count(1),0),'%') rate,SUM(COALESCE(b.satisfied, 0))   satisfied,count(1) sum
-        from  dept a inner join  mail_mark  b on a.id=b.second_dept_id where a.category='2'  GROUP BY second_dept_name order by rate desc  limit 10
+        select  b.second_dept_name name,CONCAT(ROUND(sum(COALESCE(b.satisfied, 0))*100/count(1),0),'%') rate,
+                ROUND(sum(COALESCE(b.satisfied, 0))*100/count(1),0) rateNumber,
+                SUM(COALESCE(b.satisfied, 0))   satisfied,count(1) sum
+        from  dept a inner join  mail_mark  b on a.id=b.second_dept_id where a.category='2'  GROUP BY second_dept_name order by rateNumber desc  limit 10
     </select>
 
 
     <select id="getStationCompletedRateByDept" resultType="java.util.Map" parameterType="String">
-        select  b.three_dept_name name,CONCAT(ROUND(sum(COALESCE(b.completed, 0))*100/count(1),0),'%') rate, SUM(COALESCE(b.completed, 0))   completed,count(1) sum
-        from dept a inner join  mail_mark  b on a.id=b.second_dept_id where  a.id=b.three_dept_id where b.second_dept_id=#{deptId}   GROUP BY three_dept_name order by rate desc  limit 10
+        select  b.three_dept_name name,CONCAT(ROUND(sum(COALESCE(b.completed, 0))*100/count(1),0),'%') rate,
+                ROUND(sum(COALESCE(b.completed, 0))*100/count(1),0) rateNumber,
+                SUM(COALESCE(b.completed, 0))   completed,count(1) sum
+        from dept a inner join  mail_mark  b on a.id=b.second_dept_id where  a.id=b.three_dept_id where b.second_dept_id=#{deptId}
+        GROUP BY three_dept_name order by rateNumber desc  limit 10
     </select>
     <select id="getStationResolvedRateByDept" resultType="java.util.Map" parameterType="String">
-        select  b.three_dept_name name,CONCAT(ROUND(sum(COALESCE(b.resolved, 0))*100/count(1),0),'%') rate,SUM(COALESCE(b.resolved, 0))   resolved,count(1) sum
-        from dept a inner join  mail_mark  b on a.id=b.second_dept_id where  a.id=b.three_dept_id where b.second_dept_id=#{deptId}   GROUP BY three_dept_name order by rate desc  limit 10
+        select  b.three_dept_name name,CONCAT(ROUND(sum(COALESCE(b.resolved, 0))*100/count(1),0),'%') rate,
+                ROUND(sum(COALESCE(b.resolved, 0))*100/count(1),0) rateNumber,
+                SUM(COALESCE(b.resolved, 0))   resolved,count(1) sum
+        from dept a inner join  mail_mark  b on a.id=b.second_dept_id where  a.id=b.three_dept_id where b.second_dept_id=#{deptId}
+         GROUP BY three_dept_name order by rateNumber desc  limit 10
     </select>
     <select id="getStationSatisfiedRateByDept" resultType="java.util.Map" parameterType="String">
-        select  b.three_dept_name name,CONCAT(ROUND(sum(COALESCE(b.satisfied, 0))*100/count(1),0),'%') rate,SUM(COALESCE(b.satisfied, 0))   satisfied,count(1) sum
-        from  dept a inner join  mail_mark  b on a.id=b.second_dept_id where  a.id=b.three_dept_id where b.second_dept_id=#{deptId}  GROUP BY three_dept_name order by rate desc  limit 10
+        select  b.three_dept_name name,CONCAT(ROUND(sum(COALESCE(b.satisfied, 0))*100/count(1),0),'%') rate,
+                ROUND(sum(COALESCE(b.satisfied, 0))*100/count(1),0) rateNumber,
+                SUM(COALESCE(b.satisfied, 0))   satisfied,count(1) sum
+        from  dept a inner join  mail_mark  b on a.id=b.second_dept_id where  a.id=b.three_dept_id where b.second_dept_id=#{deptId}
+          GROUP BY three_dept_name order by rateNumber desc  limit 10
     </select>
 
     <select id="getTodayMailCount" resultType="Integer" parameterType="String">