diff --git a/src/main/java/com/biutag/supervision/service/NegativeService.java b/src/main/java/com/biutag/supervision/service/NegativeService.java index 8e9cec7..fb2bd72 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeService.java @@ -539,7 +539,7 @@ public class NegativeService extends ServiceImpl { complaintCollectionPageRequest.setOriginId(negative.getOriginId()); // 使用 SpringUtil 延迟获取,打破循环依赖 ComplaintCollectionService service = SpringUtil.getBean(ComplaintCollectionService.class); - List records = service.getComplaintCollectionPageNew(complaintCollectionPageRequest).getRecords(); + List records = service.getComplaintCollectionPagNotAuth(complaintCollectionPageRequest).getRecords(); if (CollectionUtil.isEmpty(records)) { return; } diff --git a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java index 574aa1f..ccf9e59 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java @@ -27,6 +27,13 @@ public interface ComplaintCollectionService { */ Page getComplaintCollectionPageNew(ComplaintCollectionPageRequest request); + + /** + * 不鉴权 + */ + Page getComplaintCollectionPagNotAuth(ComplaintCollectionPageRequest request); + + /** * 涉访涉诉添加 * diff --git a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java index db0c813..5e719ca 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java @@ -298,6 +298,31 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic return new Page().setRecords(list).setTotal(pageResult.getTotal()); } + @Override + public Page getComplaintCollectionPagNotAuth(ComplaintCollectionPageRequest request) { + ComplaintCollectionQueryParam param = ComplaintCollectionTransfer.INSTANCE.pageRequestToPageParam(request); + if (request.getInitialReviewFileList().contains(ComplaintCollectionInitialEnum.UPLOADED.getCode())){ + param.getInitialReviewFileList().add(ComplaintCollectionInitialEnum.TIMEOUT_UPLOAD.getCode()); + } + Page page = new Page<>(param.getCurrent(), param.getSize()); + IPage pageResult = complaintCollectionMapper.selectPageWithNegative(page, param); + List list = pageResult.getRecords(); + // 字典翻译和超时信息填充 + if (CollectionUtil.isNotEmpty(list)) { + Map dictLabelMap = buildDictLabelMap(SupDictEnum.SUSPECT_PROBLEM.getCode()); + Map sfssDictLabelMap = buildDictLabelMap(SupDictEnum.SFSS_SOURCE_TABLE.getCode()); + list.forEach(one -> { + one.setInvolveProblemStr(CodeTranslateUtil.translateCodesToLabels(one.getInvolveProblem(), dictLabelMap)); + String sourceTable = CodeTranslateUtil.translateCodesToLabels(one.getSourceTable(), sfssDictLabelMap); + String sourceTableSubOne = CodeTranslateUtil.translateCodesToLabels(one.getSourceTableSubOne(), sfssDictLabelMap); + one.setSourceTablePath(sourceTable + "/" + sourceTableSubOne); + fillCheckTimeoutInfo(one); + }); + } + return new Page().setRecords(list).setTotal(pageResult.getTotal()); + } + + @Override public Result watchDetail(ComplaintCollectionWatchDetailRequest request) {