From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 jnpf-dms/jnpf-dms-controller/src/main/java/jnpf/dmsController/DmsDanganXiaohuiShenqingController.java |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/jnpf-dms/jnpf-dms-controller/src/main/java/jnpf/dmsController/DmsDanganXiaohuiShenqingController.java b/jnpf-dms/jnpf-dms-controller/src/main/java/jnpf/dmsController/DmsDanganXiaohuiShenqingController.java
new file mode 100644
index 0000000..4c167ec
--- /dev/null
+++ b/jnpf-dms/jnpf-dms-controller/src/main/java/jnpf/dmsController/DmsDanganXiaohuiShenqingController.java
@@ -0,0 +1,50 @@
+package jnpf.dmsController;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.base.ActionResult;
+import jnpf.dmsService.DmsDanganXiaohuiShenqingTongguoService;
+import jnpf.exception.DataException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@Slf4j
+@Tag(name = "DMS妗f閿�姣佺敵璇锋帴鍙�", description = "妗f閿�姣佺敵璇蜂笟鍔℃搷浣�")
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/biz/dangan/xiaohui")
+public class DmsDanganXiaohuiShenqingController {
+
+    private final DmsDanganXiaohuiShenqingTongguoService tongguoService;
+
+    @Operation(summary = "妗f閿�姣佺敵璇烽�氳繃")
+    @PostMapping("/tongguo")
+    public ActionResult<String> tongguo(@RequestBody(required = false) Map<String, Object> formData) {
+        String flowId = resolveParam(formData, "flow_id", "flowId");
+        String taskId = resolveParam(formData, "task_id", "taskId");
+        try {
+            tongguoService.tongguo(flowId, taskId);
+            return ActionResult.success("妗f閿�姣佺敵璇烽�氳繃澶勭悊鎴愬姛", "妗f閿�姣佺敵璇烽�氳繃澶勭悊鎴愬姛");
+        } catch (DataException e) {
+            log.warn("妗f閿�姣佺敵璇烽�氳繃澶勭悊澶辫触锛歠lowId={}, taskId={}, msg={}", flowId, taskId, e.getMessage());
+            return ActionResult.fail(e.getMessage());
+        }
+    }
+
+    private String resolveParam(Map<String, Object> formData, String snakeCaseKey, String camelCaseKey) {
+        if (formData == null) {
+            return "";
+        }
+        Object raw = formData.get(snakeCaseKey);
+        if (raw == null) {
+            raw = formData.get(camelCaseKey);
+        }
+        return raw == null ? "" : String.valueOf(raw).trim();
+    }
+}

--
Gitblit v1.8.0