From 1e16cfd54ed896676751071cd3c85503f4fd0115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Mon, 22 Sep 2025 10:15:40 +0800 Subject: [PATCH] =?UTF-8?q?09-22-=E5=B7=A1=E6=A3=80-=E8=AF=95=E9=AA=8C?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BA=AA=E5=BD=95=E6=90=81=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OpsInspectionTestTaskController.java | 15 ++++++++---- .../OpsInspectionTestTaskServiceImpl.java | 24 ++----------------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionTestTaskController.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionTestTaskController.java index c5da462..519eed7 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionTestTaskController.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionTestTaskController.java @@ -105,11 +105,16 @@ public class OpsInspectionTestTaskController extends BaseController { return toAjax(opsInspectionTestTaskService.deleteWithValidByIds(List.of(ids), true)); } - @SaCheckPermission("inspection:testTask:record") - @GetMapping("/record") - public R record(@RequestParam Long projectId){ - return opsInspectionTestTaskService.record(projectId); - } + /** + * 获取运维-巡检-试验任务记录 + * + * @param projectId 项目ID + */ +// @SaCheckPermission("inspection:testTask:record") +// @GetMapping("/record") +// public R record(@RequestParam Long projectId){ +// return opsInspectionTestTaskService.record(projectId); +// } diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionTestTaskServiceImpl.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionTestTaskServiceImpl.java index 9195e01..1797635 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionTestTaskServiceImpl.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionTestTaskServiceImpl.java @@ -243,32 +243,12 @@ public class OpsInspectionTestTaskServiceImpl implements IOpsInspectionTestTaskS Date finalEndDate = Date.from(firstDay.atStartOfDay(ZoneId.systemDefault()).toInstant()); Date finalStartDate = Date.from(lastDay.atTime(23, 59, 59).atZone(ZoneId.systemDefault()).toInstant()); - List lastMounth = list.stream().filter(testTaskVo -> testTaskVo.getPlanBeginTime().before(finalEndDate) && testTaskVo.getPlanFinishTime().after(finalStartDate)) + //上月数据列表 + List lastMonth = list.stream().filter(testTaskVo -> testTaskVo.getPlanBeginTime().before(finalEndDate) && testTaskVo.getPlanFinishTime().after(finalStartDate)) .toList(); - //完成实验数 - finishCount = 0L; - //待分析记录 - failCount = 0L; - //总共完成时间 - totalTestTime = 0L; - for (OpsInspectionTestTaskVo opsInspectionTestTaskVo : lastMounth) { - if (opsInspectionTestTaskVo.getPlanFinishTime().after(startDate) && opsInspectionTestTaskVo.getPlanFinishTime().before(endDate) && opsInspectionTestTaskVo.getStatus().equals("5")){ - finishCount++; - totalTestTime += opsInspectionTestTaskVo.getPlanFinishTime().getTime() - opsInspectionTestTaskVo.getPlanBeginTime().getTime(); - } - } - - Long finishCount1 = totalTestTime/ finishCount; - //完成数增长率 - record.setFinishCountAdd(BigDecimal.valueOf(finishCount / record.getFinishCount()).multiply(new BigDecimal("100"))); - //通过率 - record.setPassValueAdd(BigDecimal.valueOf(finishCount).divide(BigDecimal.valueOf(lastMounth.size()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).divide(record.getPassValue(),2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))); - //时长增长率 - record.setAverageTestTimeAdd(BigDecimal.valueOf((totalTestTime/finishCount) / record.getAverageTestTime())); - return R.ok(record); }