From e7156be5f41c64d6126b9f8139c35ab68cfcfc9d Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Sun, 28 Dec 2025 17:13:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E8=AE=BF=E6=B6=89=E8=AF=89--=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9D=A5=E6=BA=90=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../complaintCollection/ComplaintCollectionPageDTO.java | 6 ++++++ .../supervision/pojo/enums/supDict/SupDictEnum.java | 3 ++- .../ComplaintCollectionUpdateParam.java | 3 +++ .../ComplaintCollectionUpdateRequest.java | 9 +++++++++ .../ComplaintCollectionResourceService.java | 6 ++++++ .../ComplaintCollectionServiceImpl.java | 7 ++++++- 6 files changed, 32 insertions(+), 2 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 d6d65f0..9816c0e 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 @@ -28,6 +28,12 @@ public class ComplaintCollectionPageDTO { @Schema(description = "来源表类型") private String sourceTable; + @Schema(description = "来源子类型一") + private String sourceTableSubOne; + + @Schema(description = "来源表类型") + private String sourceTablePath; + @Schema(description = "案件编号") private String originId; diff --git a/src/main/java/com/biutag/supervision/pojo/enums/supDict/SupDictEnum.java b/src/main/java/com/biutag/supervision/pojo/enums/supDict/SupDictEnum.java index f17eb82..a8965cb 100644 --- a/src/main/java/com/biutag/supervision/pojo/enums/supDict/SupDictEnum.java +++ b/src/main/java/com/biutag/supervision/pojo/enums/supDict/SupDictEnum.java @@ -75,7 +75,8 @@ public enum SupDictEnum implements CodeEnum { CONTROL_TYPE("controlType", "管控人员类型"), INVOLVED_ISSUE("involvedIssue", "涉及问题"), PROTECT_RIGHTS_FILE("protectRightsFile", "维权数据过滤关键字"), - CHECK_STATUS("checkStatus", "核查结论"); + CHECK_STATUS("checkStatus", "核查结论"), + SFSS_SOURCE_TABLE("sfssSourceTable", "sfss来源类型"); private final String code; private final String desc; diff --git a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionUpdateParam.java b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionUpdateParam.java index 3e2bd21..52fe0e4 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionUpdateParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionUpdateParam.java @@ -29,6 +29,9 @@ public class ComplaintCollectionUpdateParam { @Schema(description = "来源表类型") private String sourceTable; + @Schema(description = "来源子类型") + private String sourceTableSubOne; + @Schema(description = "编号") private String originId; diff --git a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionUpdateRequest.java b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionUpdateRequest.java index 378641a..f5702f1 100644 --- a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionUpdateRequest.java +++ b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionUpdateRequest.java @@ -19,6 +19,15 @@ public class ComplaintCollectionUpdateRequest implements ParamChecked { @Schema(description = "主键ID") private String id; + @Schema(description = "来源表类型") + private String sourceTable; + + @Schema(description = "来源子类型") + private String sourceTableSubOne; + + @Schema(description = "编号") + private String originId; + @Schema(description = "受理时间") private LocalDateTime discoveryTime; 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 694288a..ed2b684 100644 --- a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java +++ b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java @@ -124,6 +124,12 @@ public class ComplaintCollectionResourceService extends BaseDAO { LambdaUpdateWrapper uw = new LambdaUpdateWrapper<>(); uw.eq(ComplaintCollection::getId, id); uw.set(StrUtil.isNotBlank(param.getResponderIdCode()), ComplaintCollection::getResponderIdCode, param.getResponderIdCode()); + if (param.getSourceTableSubOne()!=null){ + uw.set(ComplaintCollection::getSourceTableSubOne, param.getSourceTableSubOne()); + } + if (param.getSourceTable()!=null){ + uw.set(ComplaintCollection::getSourceTable, param.getSourceTable()); + } if (param.getTag() != null) { uw.set(ComplaintCollection::getTag, param.getTag()); } 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 13e8250..c66fc57 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java @@ -112,11 +112,16 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic IPage page = complaintCollectionResourceService.pageQuery(param); List records = page.getRecords(); List complaintCollectionPageDTOS = ComplaintCollectionTransfer.INSTANCE.entityToPageDTOList(records); - // 涉嫌问题拼接 if (CollectionUtil.isNotEmpty(complaintCollectionPageDTOS)) { Map dictLabelMap = buildDictLabelMap(SupDictEnum.SUSPECT_PROBLEM.getCode()); + Map sfssDictLabelMap = buildDictLabelMap(SupDictEnum.SFSS_SOURCE_TABLE.getCode()); complaintCollectionPageDTOS.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); }); } ComplaintCollectionPageVo complaintCollectionPageVo = new ComplaintCollectionPageVo();