Explorar o código

流程查阅统计报表

wangliang hai 9 meses
pai
achega
4becb35a0e

+ 11 - 6
sop-api/src/main/java/com/qmth/sop/server/api/FlowMsgReferReportController.java

@@ -27,6 +27,10 @@ public class FlowMsgReferReportController {
 
     public static final String TOTAL = "total";
 
+    public static final String READ_TOTAL = "readTotal";
+
+    public static final String UN_READ_TOTAL = "unReadTotal";
+
     public static final String READ_RATE = "readRate";
 
     public static final String UN_READ_RATE = "unReadRate";
@@ -59,17 +63,18 @@ public class FlowMsgReferReportController {
      */
     protected Map<String, Object> calculateRate(List<FlowMsgReferReportBean> flowMsgReferReportBeanList) {
         Integer sum = flowMsgReferReportBeanList.stream().mapToInt(s -> s.getSum()).sum();
-        Integer readSum = flowMsgReferReportBeanList.stream().mapToInt(s -> s.getReadMsg()).sum();
-        Integer unReadSum = flowMsgReferReportBeanList.stream().mapToInt(s -> s.getUnReadMsg()).sum();
-        BigDecimal readRate = new BigDecimal(readSum);
-        BigDecimal unReadRate = new BigDecimal(unReadSum);
+        Integer readMsgSum = flowMsgReferReportBeanList.stream().mapToInt(s -> s.getReadMsg()).sum();
+        Integer unReadMsgSum = flowMsgReferReportBeanList.stream().mapToInt(s -> s.getUnReadMsg()).sum();
+        BigDecimal readRate = new BigDecimal(readMsgSum);
+        BigDecimal unReadRate = new BigDecimal(unReadMsgSum);
         if (Objects.nonNull(sum) && sum.intValue() > 0) {
             readRate = readRate.divide(new BigDecimal(sum), 2, BigDecimal.ROUND_HALF_UP).multiply(SystemConstant.RATE)
                     .setScale(2, BigDecimal.ROUND_HALF_UP);
             unReadRate = unReadRate.divide(new BigDecimal(sum), 2, BigDecimal.ROUND_HALF_UP)
                     .multiply(SystemConstant.RATE).setScale(2, BigDecimal.ROUND_HALF_UP);
         }
-        return ImmutableMap.of(TOTAL, sum, READ_RATE, readRate, UN_READ_RATE, unReadRate,
-                ResourceSecurityReportController.RECORDS, flowMsgReferReportBeanList);
+        return new ImmutableMap.Builder<String, Object>().put(TOTAL, sum).put(READ_TOTAL, readMsgSum)
+                .put(UN_READ_TOTAL, unReadMsgSum).put(READ_RATE, readRate).put(UN_READ_RATE, unReadRate)
+                .put(ResourceSecurityReportController.RECORDS, flowMsgReferReportBeanList).build();
     }
 }

+ 12 - 1
sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -397,4 +397,15 @@ INSERT INTO sys_privilege
 VALUES(1109, '大区考勤异常数统计接口', '/api/admin/resource/security/area_ding_exception_count/report', 'URL', 1105, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(1110, '人力供应商考勤异常数统计', '/api/admin/resource/security/human_ding_exception_count/report', 'URL', 1105, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(1110, '人力供应商考勤异常数统计', '/api/admin/resource/security/human_ding_exception_count/report', 'URL', 1105, 1, 'AUTH', NULL, 1, 1, 1);
+
+-- 2024-09-20
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(1111, '大区经理查阅统计', '/api/admin/flow/msg/refer/area_manager/report', 'URL', 1101, 1, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(1112, '区域协调人查阅统计', '/api/admin/flow/msg/refer/regional_coordinator/report', 'URL', 1101, 1, 'AUTH', NULL, 1, 1, 1);
+UPDATE sys_privilege
+SET name='流程检查统计', url='FlowCheck', `type`='MENU', parent_id=1100, `sequence`=3, property=NULL, related='1111,1112', enable=1, default_auth=0, front_display=1
+WHERE id=1101;