fix-视频督察二级大屏--问题趋势数量不对

src/main/java/com/biutag/supervision/mapper/NegativeMapper.java

@@ -682,8 +682,7 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "ORDER BY `value` DESC ")
     List<OrganizeProblemRankVo> getSuboOneVideoSuperviseTeamProblemRank(Date beginTime, Date endTime, Integer groupId, Integer departId);
 
-    List<EchartsVo> getSubOneVideoSuperviseTrend(String year, String problemCode, String departId);
+    List<EchartsVo> getSubOneVideoSuperviseTrend(@Param("year") String year, @Param("problemCode") String problemCode, @Param("departIds") List<String> 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, " +

src/main/java/com/biutag/supervision/service/NegativeQueryService.java

@@ -200,9 +200,9 @@ public class NegativeQueryService {
         List<NegativeQueryVo> 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())) {
+//            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()));
+//                vo.setRemainingDuration(TimeUtil.getRemainingDuration(item.getFirstDistributeTime(), item.getMaxSignDuration(), item.getMaxHandleDuration(), item.getExtensionDays(), item.getFlowKey()));
-            }
+//            }
             return vo;
         }).toList();
         System.out.printf("耗时：%sms", System.currentTimeMillis() - l);

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<EchartsVo> getSubOneVideoSuperviseTrend(String year, String problemCode, String departId) {
-        List<EchartsVo> res = negativeMapper.getSubOneVideoSuperviseTrend(year, problemCode, departId);
+        List<String> departIds = departService.getAllNodeIds(departId);
+        List<EchartsVo> res = negativeMapper.getSubOneVideoSuperviseTrend(year, problemCode, departIds);
         return res;
     }