supervision
/
supervision-boot
6
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix:视频督察查实问题数取办结后的数据

master
buaixuexideshitongxue 4 weeks ago
parent
7d2626cfcc
commit
6691407b91
2 changed files with 12 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java
  2. 11
      src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java

10
src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java
Unescape View File

@ -421,15 +421,16 @@ public class DatavServiceImpl implements DatavService {
negativeQueryParam.setProblemSourcesCode(List.of(SPDC.getValue())); negativeQueryParam.setProblemSourcesCode(List.of(SPDC.getValue()));
negativeQueryParam.setCrtTime(List.of(request.getBeginTime(), request.getEndTime())); negativeQueryParam.setCrtTime(List.of(request.getBeginTime(), request.getEndTime()));
List<Negative> negatives = negativeResourceService.query(negativeQueryParam); List<Negative> negatives = negativeResourceService.query(negativeQueryParam);
List<Negative> ssList = negatives.stream().filter(one -> CheckStatusEnum.TRUE_SET.contains(one.getCheckStatusCode()) || CheckStatusEnum.PART_TRUE_SET.contains(one.getCheckStatusCode())).toList(); // List<Negative> ssList = negatives.stream().filter(one -> CheckStatusEnum.TRUE_SET.contains(one.getCheckStatusCode()) || CheckStatusEnum.PART_TRUE_SET.contains(one.getCheckStatusCode())).toList();
List<Negative> completedList = negatives.stream().filter(item -> ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())).toList(); List<Negative> completedList = negatives.stream().filter(item -> ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())).toList();
List<Negative> njssList = completedList.stream().filter(one -> CheckStatusEnum.TRUE_SET.contains(one.getCheckStatusCode()) || CheckStatusEnum.PART_TRUE_SET.contains(one.getCheckStatusCode())).toList();
// 使用统一的问责次数统计口径，便于核对大屏与导出逻辑差异 // 使用统一的问责次数统计口径，便于核对大屏与导出逻辑差异
AccountabilityCountUtil.AccountabilityCountResult accountabilityCountResult = accountabilityCountUtil.buildAccountabilityCountResult(negatives); AccountabilityCountUtil.AccountabilityCountResult accountabilityCountResult = accountabilityCountUtil.buildAccountabilityCountResult(negatives);
VideoSuperviseCountVo overview = new VideoSuperviseCountVo(); VideoSuperviseCountVo overview = new VideoSuperviseCountVo();
overview.setTotal(negatives.size()); overview.setTotal(negatives.size());
overview.setCompletionProblem((long) completedList.size()); overview.setCompletionProblem((long) completedList.size());
overview.setDiscoverProblem((long) ssList.size()); overview.setDiscoverProblem((long) njssList.size());
overview.setRelativeOrg(accountabilityCountResult.newUnitCount()); overview.setRelativeOrg(accountabilityCountResult.newUnitCount());
overview.setRelativePer(accountabilityCountResult.newPersonTotalCount()); overview.setRelativePer(accountabilityCountResult.newPersonTotalCount());
JSONObject data = new JSONObject().fluentPut("overview", overview); JSONObject data = new JSONObject().fluentPut("overview", overview);
@ -449,14 +450,15 @@ public class DatavServiceImpl implements DatavService {
for (SupDepart fxsj : fxsjDw) { for (SupDepart fxsj : fxsjDw) {
List<Negative> negatives = negativeMapper.getNegativeListData(fxsj.getId(), request.getBeginTime(), request.getEndTime(), proCode); List<Negative> negatives = negativeMapper.getNegativeListData(fxsj.getId(), request.getBeginTime(), request.getEndTime(), proCode);
List<Negative> ssList = negatives.stream().filter(one -> CheckStatusEnum.TRUE_SET.contains(one.getCheckStatusCode()) || CheckStatusEnum.PART_TRUE_SET.contains(one.getCheckStatusCode())).toList(); // List<Negative> ssList = negatives.stream().filter(one -> CheckStatusEnum.TRUE_SET.contains(one.getCheckStatusCode()) || CheckStatusEnum.PART_TRUE_SET.contains(one.getCheckStatusCode())).toList();
List<Negative> completedList = negatives.stream().filter(item -> ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())).toList(); List<Negative> completedList = negatives.stream().filter(item -> ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())).toList();
List<Negative> njssList = completedList.stream().filter(one -> CheckStatusEnum.TRUE_SET.contains(one.getCheckStatusCode()) || CheckStatusEnum.PART_TRUE_SET.contains(one.getCheckStatusCode())).toList();
// 使用统一的问责次数统计口径，便于核对大屏与导出逻辑差异 // 使用统一的问责次数统计口径，便于核对大屏与导出逻辑差异
AccountabilityCountUtil.AccountabilityCountResult accountabilityCountResult = accountabilityCountUtil.buildAccountabilityCountResult(negatives); AccountabilityCountUtil.AccountabilityCountResult accountabilityCountResult = accountabilityCountUtil.buildAccountabilityCountResult(negatives);
VideoSuperviseMapIconVo videoSuperviseMapIconVo = new VideoSuperviseMapIconVo(); VideoSuperviseMapIconVo videoSuperviseMapIconVo = new VideoSuperviseMapIconVo();
videoSuperviseMapIconVo.setName(fxsj.getShortName()); videoSuperviseMapIconVo.setName(fxsj.getShortName());
videoSuperviseMapIconVo.setDepartId(fxsj.getId()); videoSuperviseMapIconVo.setDepartId(fxsj.getId());
videoSuperviseMapIconVo.setDiscoverProblem(ssList.size()); videoSuperviseMapIconVo.setDiscoverProblem(njssList.size());
videoSuperviseMapIconVo.setCompletionProblem(completedList.size()); videoSuperviseMapIconVo.setCompletionProblem(completedList.size());
videoSuperviseMapIconVo.setRelativeOrg(Math.toIntExact(accountabilityCountResult.newUnitCount())); videoSuperviseMapIconVo.setRelativeOrg(Math.toIntExact(accountabilityCountResult.newUnitCount()));
videoSuperviseMapIconVo.setRelativePer(Math.toIntExact(accountabilityCountResult.newPersonTotalCount())); videoSuperviseMapIconVo.setRelativePer(Math.toIntExact(accountabilityCountResult.newPersonTotalCount()));

11
src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java
Unescape View File

@ -471,15 +471,16 @@ public class SubDatavServiceImpl implements SubDatavService {
@Override @Override
public Result<JSONObject> getSubOneAllVideoSuperviseCount(SubDataVRequest request) { public Result<JSONObject> getSubOneAllVideoSuperviseCount(SubDataVRequest request) {
List<Negative> negatives = negativeMapper.getNegativeListData(request.getDepartId(), request.getBeginTime(), request.getEndTime(), List.of(SPDC.getValue())); List<Negative> negatives = negativeMapper.getNegativeListData(request.getDepartId(), request.getBeginTime(), request.getEndTime(), List.of(SPDC.getValue()));
List<Negative> ssList = negatives.stream().filter(one -> CheckStatusEnum.TRUE_SET.contains(one.getCheckStatusCode()) || CheckStatusEnum.PART_TRUE_SET.contains(one.getCheckStatusCode())).toList(); // List<Negative> ssList = negatives.stream().filter(one -> CheckStatusEnum.TRUE_SET.contains(one.getCheckStatusCode()) || CheckStatusEnum.PART_TRUE_SET.contains(one.getCheckStatusCode())).toList();
List<Negative> completedList = negatives.stream().filter(item -> ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())).toList(); List<Negative> completedList = negatives.stream().filter(item -> ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())).toList();
List<Negative> njssList = completedList.stream().filter(one -> CheckStatusEnum.TRUE_SET.contains(one.getCheckStatusCode()) || CheckStatusEnum.PART_TRUE_SET.contains(one.getCheckStatusCode())).toList();
// 与 DatavServiceImpl 保持一致：按“有效问题 + 多处理结果拆分 + negativeId/对象/处理结果去重”的口径统计。 // 与 DatavServiceImpl 保持一致：按“有效问题 + 多处理结果拆分 + negativeId/对象/处理结果去重”的口径统计。
AccountabilityCountUtil.AccountabilityCountResult accountabilityCountResult = accountabilityCountUtil.buildAccountabilityCountResult(negatives); AccountabilityCountUtil.AccountabilityCountResult accountabilityCountResult = accountabilityCountUtil.buildAccountabilityCountResult(negatives);
VideoSuperviseCountVo overview = new VideoSuperviseCountVo(); VideoSuperviseCountVo overview = new VideoSuperviseCountVo();
overview.setTotal(negatives.size()); overview.setTotal(negatives.size());
overview.setCompletionProblem((long) completedList.size()); overview.setCompletionProblem((long) completedList.size());
overview.setDiscoverProblem((long) ssList.size()); overview.setDiscoverProblem((long) njssList.size());
overview.setRelativeOrg(accountabilityCountResult.newUnitCount()); overview.setRelativeOrg(accountabilityCountResult.newUnitCount());
overview.setRelativePer(accountabilityCountResult.newPersonTotalCount()); overview.setRelativePer(accountabilityCountResult.newPersonTotalCount());
JSONObject data = new JSONObject().fluentPut("overview", overview); JSONObject data = new JSONObject().fluentPut("overview", overview);
@ -503,15 +504,15 @@ public class SubDatavServiceImpl implements SubDatavService {
List<Negative> negatives = negativeMapper.getNegativeListData(pcs.getId(), request.getBeginTime(), request.getEndTime(), proCode); List<Negative> negatives = negativeMapper.getNegativeListData(pcs.getId(), request.getBeginTime(), request.getEndTime(), proCode);
List<Negative> ssList = negatives.stream().filter(one -> CheckStatusEnum.TRUE_SET.contains(one.getCheckStatusCode()) || CheckStatusEnum.PART_TRUE_SET.contains(one.getCheckStatusCode())).toList(); // List<Negative> ssList = negatives.stream().filter(one -> CheckStatusEnum.TRUE_SET.contains(one.getCheckStatusCode()) || CheckStatusEnum.PART_TRUE_SET.contains(one.getCheckStatusCode())).toList();
List<Negative> completedList = negatives.stream().filter(item -> ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())).toList(); List<Negative> completedList = negatives.stream().filter(item -> ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())).toList();
// 与 DatavServiceImpl 保持一致：按“有效问题 + 多处理结果拆分 + negativeId/对象/处理结果去重”的口径统计。 // 与 DatavServiceImpl 保持一致：按“有效问题 + 多处理结果拆分 + negativeId/对象/处理结果去重”的口径统计。
AccountabilityCountUtil.AccountabilityCountResult accountabilityCountResult = accountabilityCountUtil.buildAccountabilityCountResult(negatives); AccountabilityCountUtil.AccountabilityCountResult accountabilityCountResult = accountabilityCountUtil.buildAccountabilityCountResult(negatives);
List<Negative> njssList = completedList.stream().filter(one -> CheckStatusEnum.TRUE_SET.contains(one.getCheckStatusCode()) || CheckStatusEnum.PART_TRUE_SET.contains(one.getCheckStatusCode())).toList();
VideoSuperviseMapIconVo videoSuperviseMapIconVo = new VideoSuperviseMapIconVo(); VideoSuperviseMapIconVo videoSuperviseMapIconVo = new VideoSuperviseMapIconVo();
videoSuperviseMapIconVo.setName(pcs.getShortName()); videoSuperviseMapIconVo.setName(pcs.getShortName());
videoSuperviseMapIconVo.setDepartId(pcs.getId()); videoSuperviseMapIconVo.setDepartId(pcs.getId());
videoSuperviseMapIconVo.setDiscoverProblem(ssList.size()); videoSuperviseMapIconVo.setDiscoverProblem(njssList.size());
videoSuperviseMapIconVo.setCompletionProblem(completedList.size()); videoSuperviseMapIconVo.setCompletionProblem(completedList.size());
videoSuperviseMapIconVo.setRelativeOrg(Math.toIntExact(accountabilityCountResult.newUnitCount())); videoSuperviseMapIconVo.setRelativeOrg(Math.toIntExact(accountabilityCountResult.newUnitCount()));
videoSuperviseMapIconVo.setRelativePer(Math.toIntExact(accountabilityCountResult.newPersonTotalCount())); videoSuperviseMapIconVo.setRelativePer(Math.toIntExact(accountabilityCountResult.newPersonTotalCount()));

Write Preview
Loading…
Cancel
Save