From 666be234e251c5fd613c39ef82baa62673c7f243 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Tue, 15 Apr 2025 11:41:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../action/MeetingConveningEndAction.java     | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/weaver/interfaces/secret/action/MeetingConveningEndAction.java b/src/weaver/interfaces/secret/action/MeetingConveningEndAction.java
index ac48a15..a6ee35d 100644
--- a/src/weaver/interfaces/secret/action/MeetingConveningEndAction.java
+++ b/src/weaver/interfaces/secret/action/MeetingConveningEndAction.java
@@ -1,5 +1,6 @@
 package weaver.interfaces.secret.action;
 
+import com.engine.secret.util.ConfigUtil;
 import com.engine.secret.util.FlowUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -17,6 +18,7 @@ import java.util.*;
  */
 public class MeetingConveningEndAction implements Action {
     RecordSet rs = new RecordSet();
+    private static final String MAIN_FLOW_TABLE = ConfigUtil.getConfig("xqxksqlc_table");
 
     @Override
     public String execute(RequestInfo requestInfo) {
@@ -67,8 +69,18 @@ public class MeetingConveningEndAction implements Action {
         }
     }
 
+    /**
+     * 提交主流程
+     *
+     * @param requestInfo
+     * @param detail
+     * @param updateDetailSql
+     * @param errorMsg
+     */
     private void dealMainFlow(RequestInfo requestInfo, Map<String, String> detail, String updateDetailSql, Set<String> errorMsg) {
-        String mainRequestId = detail.get("xzxksqdh");
+        String mainId = detail.get("xzxksqdh");
+
+
         String conclusion = detail.get("spfhjl");
         String detailId = detail.get("detailId");
         String submitStatus = detail.get("zlctjzt");
@@ -76,19 +88,22 @@ public class MeetingConveningEndAction implements Action {
             // 已经提交成功的流程，不重复处理
             return;
         }
-        // 更新主流程表单的审批复核结论
-        String tableNameByRequestId = FlowUtil.getTableNameByRequestId(mainRequestId);
-        if (StringUtils.isBlank(tableNameByRequestId)) {
-            errorMsg.add("requestId[" + mainRequestId + "],主流程表单名称获取异常，请确认");
+
+        String mainRequestId = "";
+        rs.executeQuery("select requestid from " + MAIN_FLOW_TABLE + " where id = ?", mainId);
+        if (rs.next()) {
+            mainRequestId = rs.getString("requestid");
+        }
+        if (StringUtils.isBlank(mainRequestId)) {
+            errorMsg.add("主流程ID[" + mainId + "],主流程requestId获取异常，请确认");
             rs.executeUpdate(updateDetailSql, "2", detailId);
             return;
         }
 
         rs.writeLog("mainRequestId==" + mainRequestId);
         rs.writeLog("conclusion==" + conclusion);
-        rs.writeLog("tableNameByRequestId==" + tableNameByRequestId);
 
-        rs.executeUpdate("update " + tableNameByRequestId + " set spfhjl = ? where requestid = ?", conclusion, mainRequestId);
+        rs.executeUpdate("update " + MAIN_FLOW_TABLE + " set spfhjl = ? where requestid = ?", conclusion, mainRequestId);
 
         // 更新完成后，自动提交流程到下一节点
         rs.writeLog("mainRequestId==" + mainRequestId);