zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/enforce/job/EnforceOrgAverageTimeDto.java

@@ -15,11 +15,11 @@ public class EnforceOrgAverageTimeDto {
     private String orgName;
 
     @Excel(name = "支队平均时长")
-    @ApiModelProperty("支队平均时长")
+    @ApiModelProperty("平均移动端检查时长")
     private String orgAvgTime;
 
     @Excel(name = "视频时长")
-    @ApiModelProperty("视频时长")
+    @ApiModelProperty("平均执法记录仪时长")
     private String headCorpsAvgTime;
 
     @ApiModelProperty("视频时长与检查终端时长的比值")

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

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -159,7 +161,7 @@ public class EnforceSuperviseController {
                 }
             }
         });
-        enforceOrgTimeoutDtos.sort(Comparator.comparing(EnforceOrgTimeoutDto::getAllCount).thenComparing(EnforceOrgTimeoutDto::getOrgId));
+        enforceOrgTimeoutDtos.sort(Comparator.comparing(EnforceOrgTimeoutDto::getAllCount).reversed().thenComparing(EnforceOrgTimeoutDto::getOrgId));
         return R.ok(enforceOrgTimeoutDtos);
     }
 
@@ -200,7 +202,15 @@ public class EnforceSuperviseController {
             enforceAverageTimeDto.setOrgAvgTime(String.format("%.2f", orgAvgTime / enforceAverageTimes.size()));
             enforceAverageTimeDto.setHeadCorpsAvgTime(String.format("%.2f", headCorpsAvgTime / enforceAverageTimes.size()));
             try {
-                enforceAverageTimeDto.setRate(String.format("%.2f", (headCorpsAvgTime / enforceAverageTimes.size()) *100/(orgAvgTime / enforceAverageTimes.size())));
+                double  num1 = Double.valueOf(enforceAverageTimeDto.getHeadCorpsAvgTime());
+                double  num2 = Double.valueOf(enforceAverageTimeDto.getOrgAvgTime());
+                // 使用BigDecimal进行除法运算
+                BigDecimal result = new BigDecimal(num1).divide(new BigDecimal(num2), 4, RoundingMode.HALF_UP);
+                // 将结果乘以100转换为百分比形式
+                BigDecimal percentage = result.multiply(new BigDecimal("100"));
+                // 设置最终结果保留两位小数
+                String formattedPercentage = percentage.setScale(2, RoundingMode.HALF_UP).toString();
+                enforceAverageTimeDto.setRate(formattedPercentage);
             } catch (Exception e) {
                 log.info("计算视频时长与检查终端时长的比值异常：", e);
             }
@@ -209,6 +219,7 @@ public class EnforceSuperviseController {
         return R.ok(enforceAverageTimes);
     }
 
+
     @ApiOperation(value = "检查时长导出")
     @GetMapping(value = "/enforcement/average-time/export")
     public void selectEnforceAverageTimeExport(HttpServletResponse response, EnforcementJobProcessQuery query) {