From 596e4f50d5588279b4bbdc88e831e230402b0d1f Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Sun, 28 Dec 2025 14:36:47 +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=E4=B8=80=E7=BA=A7?= =?UTF-8?q?=E5=AD=90=E7=B1=BB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/entity/ComplaintCollection.java | 5 +++++ .../ComplaintCollectionAddRequest.java | 17 ++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/biutag/supervision/pojo/entity/ComplaintCollection.java b/src/main/java/com/biutag/supervision/pojo/entity/ComplaintCollection.java index 1932641..56a6e4b 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/ComplaintCollection.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/ComplaintCollection.java @@ -37,6 +37,11 @@ public class ComplaintCollection { @TableField("source_table") private String sourceTable; + + @Schema(description = "来源类型子类一") + @TableField("source_table_sub_one") + private String sourceTableSubOne; + /* ========================= * 1) 三表合并字段（3表都有/语义相同 -> 合并为1个） * ========================= */ 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 ff5d139..e1ef53b 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 @@ -33,6 +33,9 @@ public class ComplaintCollectionAddRequest implements ParamChecked { @Schema(description = "来源表类型") private String sourceTable; + @Schema(description = "来源类型子一级") + private String sourceTableSubOne; + @Schema(description = "编号") private String originId; @@ -93,7 +96,7 @@ public class ComplaintCollectionAddRequest implements ParamChecked { @Override public void check() { - if (StrUtil.isBlank(sourceTable)) { + if (StrUtil.hasBlank(sourceTable, sourceTableSubOne)) { throw new IllegalArgumentException("来源不能为空"); } if (ObjectUtil.isNull(discoveryTime)) { @@ -122,13 +125,13 @@ public class ComplaintCollectionAddRequest implements ParamChecked { throw new IllegalArgumentException("是否重复不能为空"); } - if (StrUtil.isBlank((leadApproval))) { - throw new IllegalArgumentException("是否领导审批不能为空"); - } +// if (StrUtil.isBlank((leadApproval))) { +// throw new IllegalArgumentException("是否领导审批不能为空"); +// } - if (CollectionUtil.isEmpty(tags)){ - throw new IllegalArgumentException("标签不能为空"); - } +// if (CollectionUtil.isEmpty(tags)){ +// throw new IllegalArgumentException("标签不能为空"); +// } if (StrUtil.isEmpty(handleMethod)){ throw new IllegalArgumentException("办理方法不能为空"); }