From 76192b564bb16e3839d373645df3fa59ee316e08 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Wed, 29 Apr 2026 10:29:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=8A=A0=E4=B8=8A=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/pojo/entity/ComplaintCollection.java | 7 ++++++- .../ComplaintCollection/ComplaintCollectionQueryParam.java | 3 +++ .../ComplaintCollectionUpdateParam.java | 4 ++++ .../ComplaintCollectionResourceService.java | 4 ++++ 4 files changed, 17 insertions(+), 1 deletion(-) 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 a2d7d01..01f0bb2 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/ComplaintCollection.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/ComplaintCollection.java @@ -388,6 +388,11 @@ public class ComplaintCollection { @TableField("init_verdict") private String initVerdict; - + /** + * 阶段2同步标记:0-未同步 1-已同步 + */ + @Schema(description = "阶段2同步标记:0-未同步 1-已同步") + @TableField("blame_sync_status") + private String blameSyncStatus; } 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 4885b80..d1163a9 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 @@ -130,6 +130,9 @@ public class ComplaintCollectionQueryParam extends BasePage { @Schema(description = "问题IDs") private List negativeIds; + @Schema(description = "阶段2同步标记") + private String blameSyncStatus; + // @Schema(description = "部门ID集合") // private Set secondDepartIds; 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 5e10b5a..4e570fe 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 @@ -163,4 +163,8 @@ public class ComplaintCollectionUpdateParam { @Schema(description = "negativeId") private String negativeId; + + @Schema(description = "阶段2同步标记:0-未同步 1-已同步") + private String blameSyncStatus; + } 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 3766f5b..99e3309 100644 --- a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java +++ b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java @@ -47,6 +47,7 @@ public class ComplaintCollectionResourceService extends BaseDAO { queryWrapper.eq(StrUtil.isNotBlank(param.getStatus()), ComplaintCollection::getStatus, param.getStatus()); queryWrapper.in(CollectionUtil.isNotEmpty(param.getInitialReviewFileList()), ComplaintCollection::getGwf3, param.getInitialReviewFileList()); queryWrapper.eq(StrUtil.isNotBlank(param.getHandleMethod()), ComplaintCollection::getHandleMethod, param.getHandleMethod()); + queryWrapper.eq(StrUtil.isNotBlank(param.getBlameSyncStatus()), ComplaintCollection::getBlameSyncStatus, param.getBlameSyncStatus()); if (queryWrapper.getExpression() == null || queryWrapper.getExpression().getSqlSegment().isEmpty()) { return Collections.emptyList(); } @@ -173,6 +174,9 @@ public class ComplaintCollectionResourceService extends BaseDAO { if (param.getNegativeId()!=null){ uw.set(ComplaintCollection::getNegativeId, param.getNegativeId()); } + if (param.getBlameSyncStatus()!=null){ + uw.set(ComplaintCollection::getBlameSyncStatus, param.getBlameSyncStatus()); + } uw.set(ComplaintCollection::getUpdateBy, UserContextHolder.getCurrentUser().getUserName()); uw.set(ComplaintCollection::getUpdateTime, LocalDateTime.now()); uw.set(StrUtil.isNotBlank(param.getInitWorkDes()), ComplaintCollection::getInitWorkDes, param.getInitWorkDes());