From 372a401077111fc6a4f368395859fe95397d67bd Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Wed, 7 Jan 2026 17:10:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E8=AE=BF=E6=B6=89=E8=AF=89--=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=8A=9E=E7=90=86=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...omplaintCollectionCheckFileQueryParam.java | 54 +++++++++++++++++++ .../ComplaintCollectionHandlerDataVo.java | 20 +++---- .../ComplaintCollectionResourceService.java | 6 +-- ...intCollectionCheckFileResourceService.java | 36 ++++++++++++- .../ComplaintCollectionServiceImpl.java | 15 +++++- 5 files changed, 117 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/biutag/supervision/pojo/param/complaintCollectionCheckFile/ComplaintCollectionCheckFileQueryParam.java diff --git a/src/main/java/com/biutag/supervision/pojo/param/complaintCollectionCheckFile/ComplaintCollectionCheckFileQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/complaintCollectionCheckFile/ComplaintCollectionCheckFileQueryParam.java new file mode 100644 index 0000000..47aac54 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/param/complaintCollectionCheckFile/ComplaintCollectionCheckFileQueryParam.java @@ -0,0 +1,54 @@ +package com.biutag.supervision.pojo.param.complaintCollectionCheckFile; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.Set; + +/** + * @ClassName ComplaintCollectionFileQueryParam + * @Description 涉访涉诉核查附件表查询实体 + * @Author shihao + * @Date 2025/12/31 15:19 + */ + +@Getter +@Setter +@Schema(description = "涉访涉诉核查附件表查询实体") +public class ComplaintCollectionCheckFileQueryParam { + + @Schema(description = "id") + private Long id; + + @Schema(description = "ids") + private Set ids; + + @Schema(description = "关联complaint_collection主键ID") + private String complaintId; + + @Schema(description = "complaintIds") + private Set complaintIds; + + @Schema(description = "文件名称") + @TableField("fileName") + private String fileName; + + + @Schema(description = "文件路径") + @TableField("filePath") + private String filePath; + + @Schema(description = "创建人（新表字段）") + @TableField("create_by") + private String createBy; + + @Schema(description = "创建时间（新表字段）") + @TableField("create_time") + private LocalDateTime createTime; + + + +} diff --git a/src/main/java/com/biutag/supervision/pojo/vo/complaintCollection/ComplaintCollectionHandlerDataVo.java b/src/main/java/com/biutag/supervision/pojo/vo/complaintCollection/ComplaintCollectionHandlerDataVo.java index 4329530..26a0bd1 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/complaintCollection/ComplaintCollectionHandlerDataVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/complaintCollection/ComplaintCollectionHandlerDataVo.java @@ -3,6 +3,8 @@ package com.biutag.supervision.pojo.vo.complaintCollection; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.util.List; + /** * @ClassName ComplaintCollectionhandlerDataVo * @Description ComplaintCollectionHandlerDataVo @@ -35,9 +37,9 @@ public class ComplaintCollectionHandlerDataVo { // // private List handlePolices; // -// /** ================= 附件 ================= */ -// -// private List files; + /** ================= 附件 ================= */ + + private List files; // // /* ======================== 内部类 ======================== */ // @@ -116,10 +118,10 @@ public class ComplaintCollectionHandlerDataVo { // private String threeLevelContentOther; // } // -// @Data -// public static class FileVo { -// -// private String fileName; -// private String filePath; -// } + @Data + public static class FileVo { + + private String fileName; + private String filePath; + } } diff --git a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java index 4c52a51..f8a0a5f 100644 --- a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java +++ b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java @@ -226,9 +226,9 @@ public class ComplaintCollectionResourceService extends BaseDAO { * @param list * @return */ - public Boolean saveOrUpdateComplaintCollection(List list) { + public List saveOrUpdateComplaintCollection(List list) { if (CollectionUtil.isEmpty(list)) { - return false; + return Collections.emptyList(); } for (ComplaintCollection item :list) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); @@ -242,7 +242,7 @@ public class ComplaintCollectionResourceService extends BaseDAO { complaintCollectionMapper.insert(item); } } - return true; + return list; } diff --git a/src/main/java/com/biutag/supervision/repository/complaintCollectionCheckFile/ComplaintCollectionCheckFileResourceService.java b/src/main/java/com/biutag/supervision/repository/complaintCollectionCheckFile/ComplaintCollectionCheckFileResourceService.java index 1512955..ada34bd 100644 --- a/src/main/java/com/biutag/supervision/repository/complaintCollectionCheckFile/ComplaintCollectionCheckFileResourceService.java +++ b/src/main/java/com/biutag/supervision/repository/complaintCollectionCheckFile/ComplaintCollectionCheckFileResourceService.java @@ -1,12 +1,18 @@ package com.biutag.supervision.repository.complaintCollectionCheckFile; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.biutag.supervision.mapper.ComplaintCollectionCheckFileMapper; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.entity.ComplaintCollectionCheckFile; +import com.biutag.supervision.pojo.param.complaintCollectionCheckFile.ComplaintCollectionCheckFileQueryParam; import com.biutag.supervision.repository.base.BaseDAO; import jakarta.annotation.Resource; +import jakarta.validation.ValidationException; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; /** @@ -22,9 +28,37 @@ public class ComplaintCollectionCheckFileResourceService extends BaseDAO { @Resource private ComplaintCollectionCheckFileMapper complaintCollectionCheckFileMapper; - public Result createComplaintCollectionCheckFile(List complaintCollectionFiles) { + public Result createComplaintCollectionCheckFile(List complaintCollectionFiles) { innerBatchInsert(complaintCollectionCheckFileMapper, complaintCollectionFiles, "添加失败！"); return Result.success(Boolean.TRUE); } + public boolean delByComplaintCollectionId(String complaintCollectionId) { + if (StrUtil.isBlank(complaintCollectionId)) { + throw new ValidationException("complaintCollectionId不能为空"); + } + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(ComplaintCollectionCheckFile::getComplaintId, complaintCollectionId); + int rows = complaintCollectionCheckFileMapper.delete(qw); + return rows >= 0; + } + + + public List query(ComplaintCollectionCheckFileQueryParam param) { + if (ObjectUtil.isNull(param)) { + return Collections.emptyList(); + } + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + setBatchQuery(param.getId(), param.getIds(), qw, ComplaintCollectionCheckFile::getId); + setBatchQuery(param.getComplaintId(), param.getComplaintIds(), qw, ComplaintCollectionCheckFile::getComplaintId); + qw.eq(StrUtil.isNotBlank(param.getFileName()), ComplaintCollectionCheckFile::getFileName, param.getFileName()); + qw.eq(StrUtil.isNotBlank(param.getFilePath()), ComplaintCollectionCheckFile::getFilePath, param.getFilePath()); + if (qw.getExpression() == null || qw.getExpression().getSqlSegment().isEmpty()) { + return Collections.emptyList(); + } + return complaintCollectionCheckFileMapper.selectList(qw); + + } + + } 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 d7b0678..91072d9 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java @@ -27,6 +27,7 @@ import com.biutag.supervision.pojo.param.DataPetitionComplaintQueryParam; 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.complaintCollectionCheckFile.ComplaintCollectionCheckFileQueryParam; import com.biutag.supervision.pojo.param.complaintCollectionFile.ComplaintCollectionFileQueryParam; import com.biutag.supervision.pojo.request.complaintCollection.*; import com.biutag.supervision.pojo.transfer.ComplaintCollectionTransfer; @@ -437,10 +438,22 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic @Override public Result handlerData(ComplaintCollectionHandlerDataRequest request) { + ComplaintCollectionHandlerDataVo complaintCollectionHandlerDataVo = new ComplaintCollectionHandlerDataVo(); ComplaintCollectionQueryParam complaintCollectionQueryParam = new ComplaintCollectionQueryParam(); complaintCollectionQueryParam.setId(request.getId()); ComplaintCollection complaintCollection = complaintCollectionResourceService.query(complaintCollectionQueryParam).get(0); - ComplaintCollectionHandlerDataVo complaintCollectionHandlerDataVo = new ComplaintCollectionHandlerDataVo(); + ComplaintCollectionCheckFileQueryParam complaintCollectionCheckFileQueryParam = new ComplaintCollectionCheckFileQueryParam(); + complaintCollectionCheckFileQueryParam.setComplaintId(request.getId()); + List complaintCollectionCheckFiles = complaintCollectionCheckFileResourceService.query(complaintCollectionCheckFileQueryParam); + if(CollectionUtil.isNotEmpty(complaintCollectionCheckFiles)){ + List files = complaintCollectionCheckFiles.stream().map(item -> { + ComplaintCollectionHandlerDataVo.FileVo fileVo = new ComplaintCollectionHandlerDataVo.FileVo(); + fileVo.setFileName(item.getFileName()); + fileVo.setFilePath(item.getFilePath()); + return fileVo; + }).toList(); + complaintCollectionHandlerDataVo.setFiles(files); + } complaintCollectionHandlerDataVo.setCheckStatusCode(complaintCollection.getCheckStatus()); complaintCollectionHandlerDataVo.setCheckStatusName(complaintCollection.getCheckStatusName()); complaintCollectionHandlerDataVo.setCheckStatusDesc(complaintCollection.getCheckStatusDesc());