From fd30c376837248f348d2d4c0a2d38c4381655ed2 Mon Sep 17 00:00:00 2001
From: pengqiang <pengqiang.it@ciic.com.cn>
Date: Fri, 12 Nov 2021 11:02:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=B5=81=E7=A8=8B=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/controller/backend/ActProcInsController.java | 11 +++++++++--
 .../resources/templates/admin/act_proc_def_list.ftl   | 11 ++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ActProcInsController.java b/src/main/java/cn/palmte/work/controller/backend/ActProcInsController.java
index 5db6987..c0bbd04 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ActProcInsController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ActProcInsController.java
@@ -5,6 +5,8 @@ import cn.palmte.work.bean.ResponseMsg;
 import cn.palmte.work.config.activiti.ActConstant;
 import cn.palmte.work.service.ActProcInsService;
 import cn.palmte.work.utils.InterfaceUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,9 +83,14 @@ public class ActProcInsController extends BaseController {
      * @return
      */
     @ResponseBody
-    @GetMapping(value = "/startProcIns")
-    public ResponseMsg startProcessInstance(@RequestParam String procDefKey) {
+    @PostMapping(value = "/startProcIns/{procDefKey}")
+    public ResponseMsg startProcessInstance(@PathVariable String procDefKey, @RequestBody String body) {
+        JSONObject json = JSON.parseObject(body);
         Map<String, Object> variables = new HashMap<>();
+        for (Object key : json.keySet()) {
+            variables.put((String)key, json.get(key));
+        }
+
         variables.put(ActConstant.START_PROCESS_USERID, InterfaceUtil.getAdminId());
         String procInsId = null;
         try {
diff --git a/src/main/resources/templates/admin/act_proc_def_list.ftl b/src/main/resources/templates/admin/act_proc_def_list.ftl
index 15fc261..4670920 100644
--- a/src/main/resources/templates/admin/act_proc_def_list.ftl
+++ b/src/main/resources/templates/admin/act_proc_def_list.ftl
@@ -252,11 +252,16 @@
 
 
     var startProcIns = function (procDefKey) {
-        var params = {procDefKey: procDefKey};
+        var params = {
+            projectId: 1,
+            projectType: 3
+        };
         $.ajax({
-            url: '${base}/actProcIns/startProcIns',
-            data: params,
+            url: '${base}/actProcIns/startProcIns/' + procDefKey,
+            data: JSON.stringify(params),
             dataType: "json",
+            contentType: "application/json",
+            type: 'post',
             async: false,
             success: function (data) {
                 layer.msg(data.msg);