From a698cff63133b01056c3dc800b4d20e8b8f0145c Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Fri, 16 Aug 2024 11:27:37 +0800
Subject: [PATCH] =?UTF-8?q?REQ-2874:=20=E6=94=BF=E5=8A=A1-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=AB=98=E6=96=B0=E5=8C=BA=E7=9F=AD=E4=BF=A1=E6=B8=A0?=
 =?UTF-8?q?=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message/controller/PendingMessageNewController.java    | 7 +++++++
 .../service/pending/client/PendingMessageClient.java       | 7 +++++++
 .../pending/request/RevokeByTemplateCodeRequest.java       | 2 ++
 3 files changed, 16 insertions(+)

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 357e8bd6..e2f04349 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
@@ -26,6 +26,7 @@ import cn.axzo.msg.center.service.pending.request.PendingMessageStatisticForWork
 import cn.axzo.msg.center.service.pending.request.PendingMessageStatisticRequest;
 import cn.axzo.msg.center.service.pending.request.PersonTodoToBeDoneStatRequest;
 import cn.axzo.msg.center.service.pending.request.PresetButtonPressedRequest;
+import cn.axzo.msg.center.service.pending.request.RevokeByTemplateCodeRequest;
 import cn.axzo.msg.center.service.pending.request.RevokePendingMessageByIdRequest;
 import cn.axzo.msg.center.service.pending.request.SetHideRequest;
 import cn.axzo.msg.center.service.pending.request.TodoHandoverRequest;
@@ -224,6 +225,12 @@ public class PendingMessageNewController implements PendingMessageClient {
         return CommonResponse.success(todoManager.revokeByBizCode(param));
     }
 
+    @Override
+    public CommonResponse<Boolean> revokeByTemplateCode(RevokeByTemplateCodeRequest param) {
+        log.info("revokeByTemplateCode, request={}", JSON.toJSONString(param));
+        return CommonResponse.success(todoManager.revokeByTemplateCode(param));
+    }
+
     @Override
     public CommonResponse<Boolean> revokeById(RevokePendingMessageByIdRequest param) {
         log.info("revokeById, request={}", JSON.toJSONString(param));
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 c425be43..f03025a5 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
@@ -17,6 +17,7 @@ import cn.axzo.msg.center.service.pending.request.PendingMessageStatisticForWork
 import cn.axzo.msg.center.service.pending.request.PendingMessageStatisticRequest;
 import cn.axzo.msg.center.service.pending.request.PersonTodoToBeDoneStatRequest;
 import cn.axzo.msg.center.service.pending.request.PresetButtonPressedRequest;
+import cn.axzo.msg.center.service.pending.request.RevokeByTemplateCodeRequest;
 import cn.axzo.msg.center.service.pending.request.RevokePendingMessageByIdRequest;
 import cn.axzo.msg.center.service.pending.request.SetHideRequest;
 import cn.axzo.msg.center.service.pending.request.TodoHandoverRequest;
@@ -267,6 +268,12 @@ public interface PendingMessageClient {
     @PostMapping(value = "/pending-message/revoke/by-biz-code", produces = {MediaType.APPLICATION_JSON_VALUE})
     CommonResponse<Boolean> revokeByTemplateCodeBizCode(@RequestBody @Valid CompletePendingMessageRequest param);
 
+    /**
+     * 通过待办模版撤回所有不是终态的待办
+     */
+    @PostMapping(value = "/pending-message/revoke/by-template-code", produces = {MediaType.APPLICATION_JSON_VALUE})
+    CommonResponse<Boolean> revokeByTemplateCode(@RequestBody @Valid RevokeByTemplateCodeRequest param);
+
     /**
      * 通过ID撤销代办
      *
diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/RevokeByTemplateCodeRequest.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/RevokeByTemplateCodeRequest.java
index 3f7f0d6a..7f31f51c 100644
--- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/RevokeByTemplateCodeRequest.java
+++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/RevokeByTemplateCodeRequest.java
@@ -6,6 +6,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -20,6 +21,7 @@ public class RevokeByTemplateCodeRequest implements Serializable {
     /**
      * 模版编码
      */
+    @NotBlank(message = "templateCode is required")
     private String templateCode;
 
     @Override