提交 4974c1e7 编写于 作者: doc_wei's avatar doc_wei

动态表单选择审批人整改完成

无相关合并请求
......@@ -8,7 +8,6 @@ import com.gexin.fastjson.JSON;
import com.skyeye.activiti.service.ActivitiModelService;
import com.skyeye.activiti.service.DsFormActivitiService;
import com.skyeye.annotation.transaction.ActivitiAndBaseTransaction;
import com.skyeye.common.constans.ActivitiConstants;
import com.skyeye.common.object.InputObject;
import com.skyeye.common.object.OutputObject;
import com.skyeye.common.util.ToolUtil;
......@@ -78,7 +77,7 @@ public class DsFormActivitiServiceImpl implements DsFormActivitiService {
// 2.将动态表单的数据构造成工作流需要的数据
String actData = getActDataByDsFormData(pageDatas);
map.put("jsonStr", actData);
activitiModelService.editActivitiModelToStartProcessByMap(map, user, sequenceId, ActivitiConstants.APPROVAL_ID);
activitiModelService.editActivitiModelToStartProcessByMap(map, user, sequenceId, map.get("approvalId").toString());
if("0".equals(map.get("code").toString())){//启动流程成功
dsFormPageDataDao.insertDsFormPageData(pageDatas);//插入DsFormPageData表
Map<String, Object> entity = dsFormPageService.getDsFormPageSequence(userId, pageId, map.get("message").toString(), StringUtils.EMPTY);
......
......@@ -8,7 +8,6 @@ import cn.hutool.json.JSONUtil;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.skyeye.activiti.service.ActivitiModelService;
import com.skyeye.common.constans.ActivitiConstants;
import com.skyeye.common.object.InputObject;
import com.skyeye.common.object.OutputObject;
import com.skyeye.common.util.ToolUtil;
......@@ -178,7 +177,7 @@ public class PageSequenceServiceImpl implements PageSequenceService{
map.put("jsonStr", JSONUtil.toJsonStr(subFormData));
map.put("keyName", bean.get("actKey"));
//请求工作流接口获取数据
activitiModelService.editActivitiModelToStartProcessByMap(map, user, map.get("id").toString(), ActivitiConstants.APPROVAL_ID);
activitiModelService.editActivitiModelToStartProcessByMap(map, user, map.get("id").toString(), map.get("approvalId").toString());
if("0".equals(map.get("code").toString())){
//请求成功
map.put("processInId", map.get("message"));
......
......@@ -213,7 +213,7 @@
a.act_id actKey
FROM
act_model a
WHERE a.page_url = #{pageUrl}
WHERE (a.page_url = #{pageUrl} OR a.ds_form_id = #{pageUrl})
AND a.state = '2'
</select>
......
......@@ -127,6 +127,7 @@
<property id="keyName" name="keyName" ref="required" var="模型key"/>
<property id="pageId" name="pageId" ref="required" var="页面id"/>
<property id="jsonStr" name="jsonStr" ref="required" var="form表单数据json串"/>
<property id="approvalId" name="approvalId" ref="required" var="[提交审批]操作必填审批人" />
</url>
<url id="dsformrevoke001" path="/post/DsFormActivitiController/editDsFormContentToRevokeByProcessInstanceId" val="动态表单类型的工作流进行撤销操作" allUse="2" groupName="动态表单工作流操作">
<property id="processInstanceId" name="processInstanceId" ref="required" var="流程id" />
......@@ -152,6 +153,7 @@
<url id="pagesequence005" path="/post/PageSequenceController/editDsFormISDraftToSubApprovalById" val="按钮直接提交审批" allUse="2">
<property id="rowId" name="id" ref="required" var="表单提交序列id" />
<property id="pageId" name="pageId" ref="required" var="页面id" />
<property id="approvalId" name="approvalId" ref="required" var="[提交审批]操作必填审批人" />
</url>
<url id="pagesequence006" path="/post/PageSequenceController/queryDsFormISDraftDetailsById" val="表单详情" allUse="2">
<property id="rowId" name="sequenceId" ref="required" var="表单提交序列id" />
......
......@@ -25,8 +25,6 @@ public class ActivitiConstants {
public static final String APPROVAL_NO_PASS = "nopass";
public static final String APPROVAL_ID = "template_approval_id";
/**
* form表单数据存储在task的varables的key
*/
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
反馈
建议
客服 返回
顶部