bug fix

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/enforce/job/EnforceSuperviseController.java

@@ -150,10 +150,13 @@ public class EnforceSuperviseController {
                         dto.setNormalCount(l.getJobCount());
                     }
                     dto.setOrgId(l.getOrgId());
-                    dto.setAllCount(l.getReviewCount()+l.getReportCount()+ l.getNormalCount());
                     dto.setOrgName(orgmap.get(l.getOrgId()));
                     enforceOrgTimeoutDtos.add(dto);
                 });
+                dto.setAllCount(dto.getReviewCount()+dto.getReportCount()+ dto.getNormalCount());
+                if (ObjectUtils.isNotEmpty(dto.getOrgId())) {
+                    enforceOrgTimeoutDtos.add(dto);
+                }
             }
         });
         enforceOrgTimeoutDtos.sort(Comparator.comparing(EnforceOrgTimeoutDto::getAllCount).thenComparing(EnforceOrgTimeoutDto::getOrgId));
@@ -196,7 +199,11 @@ public class EnforceSuperviseController {
         if (CollectionUtils.isNotEmpty(enforceAverageTimes)) {
             enforceAverageTimeDto.setOrgAvgTime(String.format("%.2f", orgAvgTime / enforceAverageTimes.size()));
             enforceAverageTimeDto.setHeadCorpsAvgTime(String.format("%.2f", headCorpsAvgTime / enforceAverageTimes.size()));
-            enforceAverageTimeDto.setRate(String.format("%.2f", rate / enforceAverageTimes.size()));
+            try {
+                enforceAverageTimeDto.setRate(String.format("%.2f", (headCorpsAvgTime / enforceAverageTimes.size()) *100/(orgAvgTime / enforceAverageTimes.size())));
+            } catch (Exception e) {
+                log.info("计算视频时长与检查终端时长的比值异常：", e);
+            }
         }
         enforceAverageTimes.add(0, enforceAverageTimeDto);
         return R.ok(enforceAverageTimes);
@@ -226,7 +233,11 @@ public class EnforceSuperviseController {
         if (CollectionUtils.isNotEmpty(enforceAverageTimes)) {
             enforceAverageTimeDto.setOrgAvgTime(String.format("%.2f", orgAvgTime / enforceAverageTimes.size()));
             enforceAverageTimeDto.setHeadCorpsAvgTime(String.format("%.2f", headCorpsAvgTime / enforceAverageTimes.size()));
-            enforceAverageTimeDto.setRate(String.format("%.2f", rate / enforceAverageTimes.size()));
+            try {
+                enforceAverageTimeDto.setRate(String.format("%.2f", (headCorpsAvgTime / enforceAverageTimes.size())*100 /(orgAvgTime / enforceAverageTimes.size())));
+            } catch (Exception e) {
+                log.info("计算视频时长与检查终端时长的比值异常：", e);
+            }
         }
         enforceAverageTimes.add(0, enforceAverageTimeDto);
 

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/job/EnforceSuperviseMapper.xml

@@ -171,7 +171,7 @@
         WHERE
         是否已超时 = '已超时'
         AND 是否删除 = '正常'
-        and 任务类型 in ('专项','复查','日常检查')
+        and 任务类型 in ('举报','复查','日常检查')
         <if test="pm.startDate != null and pm.startDate !=''">
             and 检查期限 <![CDATA[ >= ]]> #{pm.startDate}
         </if>