From e80335fb3540b59fce0d9b9e6742fa5fbcbb2b0a Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Wed, 7 Jan 2026 09:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E8=AE=BF=E6=B6=89=E8=AF=89--=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComplaintCollectionHandleMethodEnum.java | 14 +++++----- .../ComplaintCollectionQueryParam.java | 10 +++++-- .../param/SupExternalDepartQueryParam.java | 3 ++ .../ComplaintCollectionPageRequest.java | 6 +++- .../ComplaintCollectionResourceService.java | 28 ++++++++++++++++++- .../SupExternalDepartResourceService.java | 2 +- 6 files changed, 51 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/biutag/supervision/pojo/enums/complaintCollection/ComplaintCollectionHandleMethodEnum.java b/src/main/java/com/biutag/supervision/pojo/enums/complaintCollection/ComplaintCollectionHandleMethodEnum.java index 9b43e6b..3231bf1 100644 --- a/src/main/java/com/biutag/supervision/pojo/enums/complaintCollection/ComplaintCollectionHandleMethodEnum.java +++ b/src/main/java/com/biutag/supervision/pojo/enums/complaintCollection/ComplaintCollectionHandleMethodEnum.java @@ -1,25 +1,25 @@ package com.biutag.supervision.pojo.enums.complaintCollection; -import com.biutag.supervision.constants.enums.IntegerEnum; +import com.biutag.supervision.constants.enums.CodeEnum; /** * 办理方式枚举 */ -public enum ComplaintCollectionHandleMethodEnum implements IntegerEnum { +public enum ComplaintCollectionHandleMethodEnum implements CodeEnum { - ZB(0, "自办"), - XF(1, "下发"); + ZB("0", "自办"), + XF("1", "下发"); - private final int code; + private final String code; private final String desc; - ComplaintCollectionHandleMethodEnum(int code, String desc) { + ComplaintCollectionHandleMethodEnum(String code, String desc) { this.code = code; this.desc = desc; } @Override - public int getCode() { + public String getCode() { return code; } 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 5ad6e9a..7e75194 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 @@ -40,8 +40,14 @@ public class ComplaintCollectionQueryParam extends BasePage { @Schema(description = "来源表类型：PETITION/CASE_VERIF/MAILBOX") private String sourceTable; - @Schema(description = "信件来源") - private Set sourceTables; + @Schema(description = "信件来源集合") + private Set sourceTableList; + + @Schema(description = "信件来源一级子类") + private String sourceTableSubOne; + + @Schema(description = "信件来源一级子类集合") + private Set sourceTableSubOneList; @Schema(description = "反映人姓名（PETITION.responder_name；CASE_VERIF.responder_name；MAILBOX.responderName）") private String responderName; diff --git a/src/main/java/com/biutag/supervision/pojo/param/SupExternalDepartQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/SupExternalDepartQueryParam.java index ca60f6e..51a877c 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/SupExternalDepartQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/SupExternalDepartQueryParam.java @@ -21,6 +21,9 @@ public class SupExternalDepartQueryParam { private Set internalIds; + @Schema(description = "外部单位ids") + private Set externalIds; + @Schema(description = "外部来源") private String source; diff --git a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java index 58f53b0..cd33d85 100644 --- a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java +++ b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java @@ -26,7 +26,11 @@ public class ComplaintCollectionPageRequest extends BasePage implements ParamChe @Schema(description = "信件来源") - private Set sourceTables; + private Set sourceTableList; + + @Schema(description = "信件来源一级子类") + private Set sourceTableSubOneList; + @Schema(description = "信件编号") private String originId; 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 701f91e..4c52a51 100644 --- a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java +++ b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java @@ -53,7 +53,8 @@ public class ComplaintCollectionResourceService extends BaseDAO { // 构建分页对象 Page page = new Page<>(param.getCurrent(), param.getSize()); LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - setBatchQuery(param.getSourceTable(), param.getSourceTables(), qw, ComplaintCollection::getSourceTable); + setBatchQuery(param.getSourceTable(), param.getSourceTableList(), qw, ComplaintCollection::getSourceTable); + setBatchQuery(param.getSourceTableSubOne(), param.getSourceTableSubOneList(), qw, ComplaintCollection::getSourceTableSubOne); setBatchLikeQuery(param.getOriginId(), param.getOriginIds(), qw, ComplaintCollection::getOriginId); if (CollectionUtil.size(param.getDiscoveryTimeList()) == 2 && param.getDiscoveryTimeList().get(0) != null @@ -220,4 +221,29 @@ public class ComplaintCollectionResourceService extends BaseDAO { } + /** + * + * @param list + * @return + */ + public Boolean saveOrUpdateComplaintCollection(List list) { + if (CollectionUtil.isEmpty(list)) { + return false; + } + for (ComplaintCollection item :list) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(ComplaintCollection::getOriginId, item.getOriginId()); + query.eq(ComplaintCollection::getSourceTable, item.getSourceTable()); + ComplaintCollection exist = complaintCollectionMapper.selectOne(query); + if (exist != null) { + item.setId(exist.getId()); + complaintCollectionMapper.updateById(item); + } else { + complaintCollectionMapper.insert(item); + } + } + return true; + } + + } diff --git a/src/main/java/com/biutag/supervision/repository/supExternalDepart/SupExternalDepartResourceService.java b/src/main/java/com/biutag/supervision/repository/supExternalDepart/SupExternalDepartResourceService.java index d8bd3a1..542d929 100644 --- a/src/main/java/com/biutag/supervision/repository/supExternalDepart/SupExternalDepartResourceService.java +++ b/src/main/java/com/biutag/supervision/repository/supExternalDepart/SupExternalDepartResourceService.java @@ -29,7 +29,7 @@ public class SupExternalDepartResourceService { LambdaQueryWrapper wrapper= new LambdaQueryWrapper<>(); wrapper.eq(StrUtil.isNotBlank(param.getSource()), SupExternalDepart::getSource, param.getSource()); wrapper.in(CollectionUtil.isNotEmpty(param.getInternalIds()), SupExternalDepart::getInternalId, param.getInternalIds()); - + wrapper.in(CollectionUtil.isNotEmpty(param.getExternalIds()), SupExternalDepart::getExternalId, param.getExternalIds()); if (wrapper.getExpression() == null || wrapper.getExpression().getSqlSegment().isEmpty()) { return Collections.emptyList(); }