Browse Source

feat: 隐藏办理方式

master
buaixuexideshitongxue 1 month ago
parent
commit
d51fb469e6
  1. 4
      src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionExcelDTO.java
  2. 3
      src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ExportComplaintCollectionExcelVo.java
  3. 4
      src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAddRequest.java
  4. 7
      src/main/resources/mapper/ComplaintCollectionMapper.xml

4
src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionExcelDTO.java

@ -1,5 +1,6 @@
package com.biutag.supervision.pojo.dto.complaintCollection; package com.biutag.supervision.pojo.dto.complaintCollection;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ColumnWidth;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
@ -74,8 +75,7 @@ public class ComplaintCollectionExcelDTO {
@ColumnWidth(20) @ColumnWidth(20)
private String publicRecognition; private String publicRecognition;
@ExcelProperty("办理方式") @ExcelIgnore
@ColumnWidth(20)
private String handleMethod; private String handleMethod;
@ExcelProperty("业务类别") @ExcelProperty("业务类别")

3
src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ExportComplaintCollectionExcelVo.java

@ -1,5 +1,6 @@
package com.biutag.supervision.pojo.dto.complaintCollection; package com.biutag.supervision.pojo.dto.complaintCollection;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
@ -81,7 +82,7 @@ public class ExportComplaintCollectionExcelVo {
@ExcelProperty("群众认可") @ExcelProperty("群众认可")
private String publicRecognition; private String publicRecognition;
@ExcelProperty("办理方式") @ExcelIgnore
private String handleMethod; private String handleMethod;
@ExcelProperty("是否重复件") @ExcelProperty("是否重复件")

4
src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAddRequest.java

@ -190,10 +190,6 @@ public class ComplaintCollectionAddRequest implements ParamChecked {
// if (CollectionUtil.isEmpty(tags)){ // if (CollectionUtil.isEmpty(tags)){
// throw new IllegalArgumentException("标签不能为空"); // throw new IllegalArgumentException("标签不能为空");
// } // }
if (StrUtil.isEmpty(handleMethod)){
throw new IllegalArgumentException("办理方式不能为空");
}
if (CollectionUtil.isNotEmpty(involveProblemIdList)){ if (CollectionUtil.isNotEmpty(involveProblemIdList)){
involveProblemIdStr = involveProblemIdList.stream() involveProblemIdStr = involveProblemIdList.stream()
.filter(StrUtil::isNotBlank) .filter(StrUtil::isNotBlank)

7
src/main/resources/mapper/ComplaintCollectionMapper.xml

@ -315,7 +315,14 @@
<if test="param.tags != null and param.tags.size > 0"> <if test="param.tags != null and param.tags.size > 0">
AND ( AND (
<foreach collection="param.tags" item="tagItem" separator=" OR "> <foreach collection="param.tags" item="tagItem" separator=" OR ">
<choose>
<when test="tagItem == '__EMPTY__'">
(cc.tag IS NULL OR TRIM(cc.tag) = '')
</when>
<otherwise>
FIND_IN_SET(#{tagItem}, cc.tag) FIND_IN_SET(#{tagItem}, cc.tag)
</otherwise>
</choose>
</foreach> </foreach>
) )
</if> </if>

Loading…
Cancel
Save