From d51fb469e65f2c4c06b029734ea73294418e829e Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Wed, 12 Aug 2026 10:48:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=9A=90=E8=97=8F=E5=8A=9E=E7=90=86?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../complaintCollection/ComplaintCollectionExcelDTO.java | 4 ++-- .../ExportComplaintCollectionExcelVo.java | 3 ++- .../ComplaintCollectionAddRequest.java | 4 ---- src/main/resources/mapper/ComplaintCollectionMapper.xml | 9 ++++++++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionExcelDTO.java b/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionExcelDTO.java index 5a083b9..79ae021 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionExcelDTO.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionExcelDTO.java @@ -1,5 +1,6 @@ package com.biutag.supervision.pojo.dto.complaintCollection; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; @@ -74,8 +75,7 @@ public class ComplaintCollectionExcelDTO { @ColumnWidth(20) private String publicRecognition; - @ExcelProperty("办理方式") - @ColumnWidth(20) + @ExcelIgnore private String handleMethod; @ExcelProperty("业务类别") diff --git a/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ExportComplaintCollectionExcelVo.java b/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ExportComplaintCollectionExcelVo.java index 0426f6e..2e7252f 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ExportComplaintCollectionExcelVo.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ExportComplaintCollectionExcelVo.java @@ -1,5 +1,6 @@ package com.biutag.supervision.pojo.dto.complaintCollection; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Getter; @@ -81,7 +82,7 @@ public class ExportComplaintCollectionExcelVo { @ExcelProperty("群众认可") private String publicRecognition; - @ExcelProperty("办理方式") + @ExcelIgnore private String handleMethod; @ExcelProperty("是否重复件") diff --git a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAddRequest.java b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAddRequest.java index 442b672..4bf0932 100644 --- a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAddRequest.java +++ b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAddRequest.java @@ -190,10 +190,6 @@ public class ComplaintCollectionAddRequest implements ParamChecked { // if (CollectionUtil.isEmpty(tags)){ // throw new IllegalArgumentException("标签不能为空"); // } - if (StrUtil.isEmpty(handleMethod)){ - throw new IllegalArgumentException("办理方式不能为空"); - } - if (CollectionUtil.isNotEmpty(involveProblemIdList)){ involveProblemIdStr = involveProblemIdList.stream() .filter(StrUtil::isNotBlank) diff --git a/src/main/resources/mapper/ComplaintCollectionMapper.xml b/src/main/resources/mapper/ComplaintCollectionMapper.xml index 37a08f3..6f85f7c 100644 --- a/src/main/resources/mapper/ComplaintCollectionMapper.xml +++ b/src/main/resources/mapper/ComplaintCollectionMapper.xml @@ -315,7 +315,14 @@ AND ( - FIND_IN_SET(#{tagItem}, cc.tag) + + + (cc.tag IS NULL OR TRIM(cc.tag) = '') + + + FIND_IN_SET(#{tagItem}, cc.tag) + + )