From e2bd3521f49d42d4e99921055509d851d0d8a878 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Wed, 31 Dec 2025 16:20:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E8=AE=BF=E6=B6=89=E8=AF=89--=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=97=B6=E5=9B=9E=E6=98=BE=E9=99=84=E4=BB=B6=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComplaintCollectionPageDTO.java | 36 ++++--------------- .../ComplaintCollectionServiceImpl.java | 14 ++++++++ 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionPageDTO.java b/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionPageDTO.java index eff3aa8..02f1291 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionPageDTO.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionPageDTO.java @@ -2,11 +2,14 @@ package com.biutag.supervision.pojo.dto.complaintCollection; import com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionSourceTableEnum; import com.biutag.supervision.pojo.enums.complaintCollection.YesOrNoEnum; +import com.biutag.supervision.pojo.vo.FileVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; /** * @ClassName ComplaintCollectionPageDTO @@ -235,36 +238,6 @@ public class ComplaintCollectionPageDTO { private String gwf4; @Schema(description = "自定义5") private String gwf5; - @Schema(description = "自定义6") - private String gwf6; - @Schema(description = "自定义7") - private String gwf7; - @Schema(description = "自定义8") - private String gwf8; - @Schema(description = "自定义9") - private String gwf9; - @Schema(description = "自定义10") - private String gwf10; - @Schema(description = "自定义11") - private String gwf11; - @Schema(description = "自定义12") - private String gwf12; - @Schema(description = "自定义13") - private String gwf13; - @Schema(description = "自定义14") - private String gwf14; - @Schema(description = "自定义15") - private String gwf15; - @Schema(description = "自定义16") - private String gwf16; - @Schema(description = "自定义17") - private String gwf17; - @Schema(description = "自定义18") - private String gwf18; - @Schema(description = "自定义19") - private String gwf19; - @Schema(description = "自定义20") - private String gwf20; /* ---- 审计字段 ---- */ @Schema(description = "创建人") @@ -289,5 +262,8 @@ public class ComplaintCollectionPageDTO { @Schema(description = "状态，显示用，暂无实际意义") private String status; + @Schema(description = "附件列表") + private List thingFiles = new ArrayList<>(); + } 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 1dba970..deea0f1 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java @@ -25,8 +25,10 @@ import com.biutag.supervision.pojo.param.ComplaintCollection.ComplaintCollection import com.biutag.supervision.pojo.param.SupDepartQueryParam; import com.biutag.supervision.pojo.param.SupPoliceQueryParam; import com.biutag.supervision.pojo.param.complaintCollectionBlame.ComplaintCollectionBlameQueryParam; +import com.biutag.supervision.pojo.param.complaintCollectionFile.ComplaintCollectionFileQueryParam; import com.biutag.supervision.pojo.request.complaintCollection.*; import com.biutag.supervision.pojo.transfer.ComplaintCollectionTransfer; +import com.biutag.supervision.pojo.vo.FileVo; import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionPageVo; import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionWatchDetailVO; import com.biutag.supervision.repository.complaintCollection.ComplaintCollectionResourceService; @@ -173,6 +175,10 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic IPage page = complaintCollectionResourceService.pageQuery(param); List records = page.getRecords(); List complaintCollectionPageDTOS = ComplaintCollectionTransfer.INSTANCE.entityToPageDTOList(records); + Set ids = complaintCollectionPageDTOS.stream().map(ComplaintCollectionPageDTO::getId).collect(Collectors.toSet()); + ComplaintCollectionFileQueryParam complaintCollectionFileQueryParam = new ComplaintCollectionFileQueryParam(); + complaintCollectionFileQueryParam.setComplaintIds(ids); + Map> complaintCollectionFileMap= complaintCollectionFileResourceService.queryGroupBy(complaintCollectionFileQueryParam, ComplaintCollectionFile::getComplaintId); if (CollectionUtil.isNotEmpty(complaintCollectionPageDTOS)) { Map dictLabelMap = buildDictLabelMap(SupDictEnum.SUSPECT_PROBLEM.getCode()); Map sfssDictLabelMap = buildDictLabelMap(SupDictEnum.SFSS_SOURCE_TABLE.getCode()); @@ -183,6 +189,14 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic String sourceTable = CodeTranslateUtil.translateCodesToLabels(one.getSourceTable(), sfssDictLabelMap); String sourceTableSubOne = CodeTranslateUtil.translateCodesToLabels(one.getSourceTableSubOne(), sfssDictLabelMap); one.setSourceTablePath(sourceTable + "/" + sourceTableSubOne); + List files = complaintCollectionFileMap.getOrDefault(one.getId(), Collections.emptyList()); + List fileVos = files.stream().map(file -> { + FileVo fileVo = new FileVo(); + fileVo.setFileName(file.getFileName()); + fileVo.setFilePath(file.getFilePath()); + return fileVo; + }).toList(); + one.setThingFiles(fileVos); }); } ComplaintCollectionPageVo complaintCollectionPageVo = new ComplaintCollectionPageVo();