diff --git a/src/main/java/com/supervision/police/dto/CaseProcessDTO.java b/src/main/java/com/supervision/police/dto/CaseProcessDTO.java index 70e356b..4291285 100644 --- a/src/main/java/com/supervision/police/dto/CaseProcessDTO.java +++ b/src/main/java/com/supervision/police/dto/CaseProcessDTO.java @@ -46,5 +46,6 @@ public class CaseProcessDTO { this.analysisStatus = StrUtil.toString(modelCase.getCaseAnalysisStatus()); this.analysisSuccessTime = modelCase.getCaseAnalysisSuccessTime(); this.identifyResult = modelCase.getIdentifyResult(); + this.enableAnalyse = modelCase.getCaseAnalysisStatus() == 1 ? "1" : "0"; } } diff --git a/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java b/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java index ed039bd..6302996 100644 --- a/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java @@ -39,16 +39,7 @@ public class MroServiceImpl implements MroService { .in(CollUtil.isNotEmpty(caseProcessReqVO.getAnalysisStatus()), ModelCase::getCaseAnalysisStatus, caseProcessReqVO.getAnalysisStatus()) .orderBy(true, StrUtil.equalsIgnoreCase(caseProcessReqVO.getSort(), "desc"), ModelCase::getCaseAnalysisSuccessTime) .page(Page.of(page, size)); - - final Set processCaseIds = new HashSet<>(); - if (!paged.getRecords().isEmpty()){ - caseRecordService.queryProcessingTaskList().stream().map(TaskCaseRecord::getCaseId).forEach(processCaseIds::add); - } - return paged.convert(r->{ - CaseProcessDTO caseProcessDTO = new CaseProcessDTO(r); - caseProcessDTO.setEnableAnalyse(processCaseIds.contains(r.getId()) ? "0" : "1"); - return caseProcessDTO; - }); + return paged.convert(CaseProcessDTO::new); }