From eb004581406a953f582a4ecf04b4dd2f19999128 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Mon, 5 Jan 2026 10:21:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E8=AE=BF=E6=B6=89=E8=AF=89--=E4=BF=A1?= =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/ComplaintCollectionController.java | 6 +++ .../ComplaintCollectionQueryParam.java | 6 +++ ...ComplaintCollectionMailRepeattRequest.java | 37 +++++++++++++++++++ .../ComplaintCollectionMailRepeattVo.java | 26 +++++++++++++ .../ComplaintCollectionResourceService.java | 1 + .../ComplaintCollectionService.java | 8 ++++ .../ComplaintCollectionServiceImpl.java | 25 +++++++++++++ 7 files changed, 109 insertions(+) create mode 100644 src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionMailRepeattRequest.java create mode 100644 src/main/java/com/biutag/supervision/pojo/vo/complaintCollection/ComplaintCollectionMailRepeattVo.java diff --git a/src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java b/src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java index 36d867b..8f86c48 100644 --- a/src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java +++ b/src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java @@ -2,6 +2,7 @@ package com.biutag.supervision.controller.data; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.request.complaintCollection.*; +import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionMailRepeattVo; import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionPageVo; import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionWatchDetailVO; import com.biutag.supervision.service.complaintCollection.ComplaintCollectionService; @@ -67,4 +68,9 @@ public class ComplaintCollectionController { } + @Operation(description = "是否重复件") + @PostMapping("/maileRepeatt") + public Result maileRepeatt(@RequestBody ComplaintCollectionMailRepeattRequest request){ + return complaintCollectionService.maileRepeatt(request); + } } diff --git a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java index 1458ff2..0d9db53 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java @@ -73,6 +73,12 @@ public class ComplaintCollectionQueryParam extends BasePage { @Schema(description = "标签") private List tags; + @Schema(description = "投诉人身份证号") + private String responderIdCode; + + @Schema(description = "投诉人身份证号集合") + private Set responderIdCodes; + // @Schema(description = "部门ID集合") // private Set secondDepartIds; diff --git a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionMailRepeattRequest.java b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionMailRepeattRequest.java new file mode 100644 index 0000000..0668644 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionMailRepeattRequest.java @@ -0,0 +1,37 @@ +package com.biutag.supervision.pojo.request.complaintCollection; + +import cn.hutool.core.util.IdcardUtil; +import cn.hutool.core.util.StrUtil; +import com.biutag.supervision.aop.ParamChecked; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +/** + * @ClassName ComplaintCollectionMailRepeattRequest + * @Description 是否重复件查询 + * @Author shihao + * @Date 2026/1/4 11:10 + */ +@Setter +@Getter +@Schema(description = "是否重复件查询") +public class ComplaintCollectionMailRepeattRequest implements ParamChecked { + + + @Schema(description = "投诉人身份证号") + private String responderIdCode; + +// @Schema(description = "投诉人姓名") +// private String responderName; + + @Override + public void check() { + if (StrUtil.isBlank(responderIdCode)){ + throw new IllegalArgumentException("投诉人身份证不能为空"); + } + if (StrUtil.isNotBlank(responderIdCode) && !IdcardUtil.isValidCard(responderIdCode)){ + throw new IllegalArgumentException("请输入正确的身份证格式！"); + } + } +} diff --git a/src/main/java/com/biutag/supervision/pojo/vo/complaintCollection/ComplaintCollectionMailRepeattVo.java b/src/main/java/com/biutag/supervision/pojo/vo/complaintCollection/ComplaintCollectionMailRepeattVo.java new file mode 100644 index 0000000..4b78814 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/vo/complaintCollection/ComplaintCollectionMailRepeattVo.java @@ -0,0 +1,26 @@ +package com.biutag.supervision.pojo.vo.complaintCollection; + +import com.biutag.supervision.pojo.dto.complaintCollection.ComplaintCollectionPageDTO; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +/** + * @ClassName ComplaintCollectionMailRepeattVo + * @Description 查重vo + * @Author shihao + * @Date 2026/1/4 13:58 + */ +@Getter +@Setter +@Schema(description = "查重vo") +public class ComplaintCollectionMailRepeattVo { + + + @Schema(description = "重复列表") + private List complaintCollectionPageDTOS; + + +} 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 a64ac2b..f433871 100644 --- a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java +++ b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java @@ -37,6 +37,7 @@ public class ComplaintCollectionResourceService extends BaseDAO { public List query(ComplaintCollectionQueryParam param) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); setBatchQuery(param.getId(), param.getIds(), queryWrapper, ComplaintCollection::getId); + setBatchQuery(param.getResponderIdCode(), param.getResponderIdCodes(), queryWrapper, ComplaintCollection::getResponderIdCode); setBatchQuery(param.getOriginId(), param.getOriginIds(), queryWrapper, ComplaintCollection::getOriginId); queryWrapper.eq(StrUtil.isNotBlank(param.getSourceTable()), ComplaintCollection::getSourceTable, param.getSourceTable()); queryWrapper.eq(StrUtil.isNotBlank(param.getResponderName()), ComplaintCollection::getResponderName, param.getResponderName()); 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 27170b3..903d1f3 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java @@ -2,6 +2,7 @@ package com.biutag.supervision.service.complaintCollection; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.request.complaintCollection.*; +import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionMailRepeattVo; import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionPageVo; import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionWatchDetailVO; @@ -58,4 +59,11 @@ public interface ComplaintCollectionService { */ Result watchDetail(ComplaintCollectionWatchDetailRequest request); + /** + * 是否重复件 + * @param request + * @return + */ + Result maileRepeatt(ComplaintCollectionMailRepeattRequest 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 6326e14..575434f 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java @@ -7,6 +7,7 @@ import cn.hutool.core.lang.Opt; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.biutag.supervision.common.UserContextHolder; import com.biutag.supervision.constants.enums.*; @@ -29,6 +30,7 @@ import com.biutag.supervision.pojo.param.complaintCollectionFile.ComplaintCollec 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.ComplaintCollectionMailRepeattVo; import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionPageVo; import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionWatchDetailVO; import com.biutag.supervision.repository.complaintCollection.ComplaintCollectionResourceService; @@ -390,6 +392,29 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic return Result.success(vo); } + @Override + public Result maileRepeatt(ComplaintCollectionMailRepeattRequest request) { + ComplaintCollectionQueryParam complaintCollectionQueryParam = new ComplaintCollectionQueryParam(); + complaintCollectionQueryParam.setResponderIdCode(request.getResponderIdCode()); + List complaintCollections = complaintCollectionResourceService.query(complaintCollectionQueryParam); + List dtos = ComplaintCollectionTransfer.INSTANCE.entityToPageDTOList(complaintCollections); + if (CollectionUtil.isNotEmpty(dtos)) { + Map dictLabelMap = buildDictLabelMap(SupDictEnum.SUSPECT_PROBLEM.getCode()); + Map sfssDictLabelMap = buildDictLabelMap(SupDictEnum.SFSS_SOURCE_TABLE.getCode()); + dtos.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); + }); + } + ComplaintCollectionMailRepeattVo complaintCollectionMailRepeattVo = new ComplaintCollectionMailRepeattVo(); + complaintCollectionMailRepeattVo.setComplaintCollectionPageDTOS(dtos); + return Result.success(complaintCollectionMailRepeattVo); + } + public VerifyData buildVerifyData(ComplaintCollectionAndBlameAddRequest request) { VerifyData verifyData = new VerifyData(); BeanUtil.copyProperties(request, verifyData);