From 7d9e0cd0b4aa232c663ee75ead8e0509a24d0025 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Tue, 20 Jan 2026 15:53:27 +0800 Subject: [PATCH] =?UTF-8?q?fix-=E8=A7=86=E9=A2=91=E7=9D=A3=E5=AF=9F?= =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=A4=A7=E5=B1=8F--=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E6=95=B0=E9=87=8F=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/biutag/supervision/mapper/NegativeMapper.java | 3 +-- .../biutag/supervision/service/NegativeQueryService.java | 6 +++--- .../supervision/service/SubOneVideoSuperviseService.java | 4 +++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java index 7f4aa9c..8252672 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java @@ -682,8 +682,7 @@ public interface NegativeMapper extends BaseMapper { "ORDER BY `value` DESC ") List getSuboOneVideoSuperviseTeamProblemRank(Date beginTime, Date endTime, Integer groupId, Integer departId); - List getSubOneVideoSuperviseTrend(String year, String problemCode, String departId); - + List getSubOneVideoSuperviseTrend(@Param("year") String year, @Param("problemCode") String problemCode, @Param("departIds") List departIds); // @Select("SELECT COUNT(DISTINCT ng.id) AS discoverProblem, " + // "COUNT(DISTINCT IF(ng.processing_status='completed', ng.id, NULL)) AS completionProblem, " + // "COUNT(DISTINCT ng.involveDepartId) AS relativeOrg, " + diff --git a/src/main/java/com/biutag/supervision/service/NegativeQueryService.java b/src/main/java/com/biutag/supervision/service/NegativeQueryService.java index 6d08745..16b36b6 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeQueryService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeQueryService.java @@ -200,9 +200,9 @@ public class NegativeQueryService { List list = page.getRecords().stream().map(item -> { NegativeQueryVo vo = new NegativeQueryVo(); BeanUtils.copyProperties(item, vo); - if (Objects.nonNull(item.getFirstDistributeTime()) && !ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())) { - vo.setRemainingDuration(TimeUtil.getRemainingDuration(item.getFirstDistributeTime(), item.getMaxSignDuration(), item.getMaxHandleDuration(), item.getExtensionDays(), item.getFlowKey())); - } +// if (Objects.nonNull(item.getFirstDistributeTime()) && !ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())) { +// vo.setRemainingDuration(TimeUtil.getRemainingDuration(item.getFirstDistributeTime(), item.getMaxSignDuration(), item.getMaxHandleDuration(), item.getExtensionDays(), item.getFlowKey())); +// } return vo; }).toList(); System.out.printf("耗时：%sms", System.currentTimeMillis() - l); diff --git a/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java b/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java index 26248c9..e169c35 100644 --- a/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java +++ b/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java @@ -20,6 +20,7 @@ import java.util.List; @Service public class SubOneVideoSuperviseService { private final NegativeMapper negativeMapper; + private final SupDepartService departService; public VideoSuperviseCountVo getSubOneAllVideoSuperviseCount(Date beginTime, Date endTime, Integer departId) { @@ -38,7 +39,8 @@ public class SubOneVideoSuperviseService { } public List getSubOneVideoSuperviseTrend(String year, String problemCode, String departId) { - List res = negativeMapper.getSubOneVideoSuperviseTrend(year, problemCode, departId); + List departIds = departService.getAllNodeIds(departId); + List res = negativeMapper.getSubOneVideoSuperviseTrend(year, problemCode, departIds); return res; }