From 839139eb2629775280101b6ac28246e5517e8b9f Mon Sep 17 00:00:00 2001
From: yangqicheng <yangqicheng@axzo.cn>
Date: Thu, 23 May 2024 16:53:01 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20REQ-2324-=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BE=85=E5=8A=9E=E4=B8=BA=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E4=B8=AD=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0subBizCodes?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message/controller/PendingMessageNewController.java   | 4 ++--
 .../center/message/service/todo/manage/TodoManager.java   | 4 ++--
 .../service/pending/client/PendingMessageClient.java      | 2 +-
 .../src/main/java/cn/axzo/msg/center/dal/TodoDao.java     | 8 ++++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java
index 5804c8c4..f3c279cb 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java
@@ -238,11 +238,11 @@ public class PendingMessageNewController implements PendingMessageClient {
     }
 
     @Override
-    public CommonResponse<Boolean> batchSetProcessing(List<String> identityCodes) {
+    public CommonResponse<Boolean> batchSetProcessing(List<String> identityCodes, List<String> subBizCodes) {
         log.info("setProcessing, request={}", JSON.toJSONString(identityCodes));
         Boolean result = null;
         try {
-            result = todoManager.batchSetProcessing(identityCodes);
+            result = todoManager.batchSetProcessing(identityCodes, subBizCodes);
             return CommonResponse.success(result);
         } finally {
             log.info("setProcessing. request={}, response={}", identityCodes, result);
diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java
index 560d3b34..6b1f4857 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java
@@ -386,10 +386,10 @@ public class TodoManager {
      * 将待办设置为执行中
      */
     @Transactional(rollbackFor = Exception.class)
-    public Boolean batchSetProcessing(List<String> identityCodes) {
+    public Boolean batchSetProcessing(List<String> identityCodes, List<String> subBizCodes) {
         log.info("batch set processing...,request:{}", JSONUtil.toJsonStr(identityCodes));
         BizAssertions.assertTrue(CollectionUtils.isNotEmpty(identityCodes), "identityCodes列表不能为空");
-        Boolean updated = todoDao.batchSetExecutableProcessing(identityCodes);
+        Boolean updated = todoDao.batchSetExecutableProcessing(identityCodes, subBizCodes);
         if (updated) {
             List<Todo> updatedTodos = todoDao.getByIdentityCodes(identityCodes);
             TodoRequestContext ctx = TodoRequestContext.create("batchSetProcessing", identityCodes);
diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java
index fe87a5b9..d4047408 100644
--- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java
+++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java
@@ -274,7 +274,7 @@ public interface PendingMessageClient {
      * 批量将待办设置为处理中
      */
     @PostMapping(value = "/pending-message/update/batchSetProcessing", produces = {MediaType.APPLICATION_JSON_VALUE})
-    CommonResponse<Boolean> batchSetProcessing(@RequestBody @Valid List<String> identityCodes);
+    CommonResponse<Boolean> batchSetProcessing(@RequestBody @Valid List<String> identityCodes, List<String> subBizCodes);
 
     /**
      * 通过BizCode获取最新代办
diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/TodoDao.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/TodoDao.java
index d4672a4c..f23f7966 100644
--- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/TodoDao.java
+++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/TodoDao.java
@@ -105,10 +105,14 @@ public class TodoDao extends ServiceImpl<TodoMapper, Todo> {
         return new SampleTodos(todos);
     }
 
-    public Boolean batchSetExecutableProcessing(List<String> identityCodes) {
+    public Boolean batchSetExecutableProcessing(List<String> identityCodes, List<String> subBizCodes) {
+        if (CollectionUtils.isEmpty(identityCodes) && CollectionUtils.isEmpty(subBizCodes)) {
+            throw new IllegalArgumentException("identityCodes and subBizCodes can't be empty");
+        }
         return lambdaUpdate()
                 .eq(Todo::getType, TodoType.EXECUTABLE)
-                .in(Todo::getIdentityCode, identityCodes)
+                .in(CollectionUtils.isNotEmpty(identityCodes), Todo::getIdentityCode, identityCodes)
+                .in(CollectionUtils.isNotEmpty(subBizCodes), Todo::getSubBizCode, subBizCodes)
                 .in(Todo::getState, PendingMessageStateEnum.HAS_BEEN_SENT, PendingMessageStateEnum.PROCESSING)
                 .set(Todo::getState, PendingMessageStateEnum.PROCESSING)
                 .update();