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 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);