diff --git a/skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/DsFormActivitiServiceImpl.java b/skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/DsFormActivitiServiceImpl.java index eb2f569094c389c663d4dac9c6217d6c217f23d8..928036b8c896e2672d3bbd2e0b113df5afde9f36 100644 --- a/skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/DsFormActivitiServiceImpl.java +++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/DsFormActivitiServiceImpl.java @@ -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); diff --git a/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java b/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java index 800794e2aaf04503777837bd76e94f68f6990815..5421ef839f57a35f672a2321775da96c8a2d0371 100644 --- a/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java +++ b/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java @@ -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")); diff --git a/skyeye-activiti/src/main/resources/mapper/activiti/ActModelMapper.xml b/skyeye-activiti/src/main/resources/mapper/activiti/ActModelMapper.xml index 2130b234bb1479b97051323014077154cba0f773..5a914674a503c8edaba9496c6aba095d6582bd23 100644 --- a/skyeye-activiti/src/main/resources/mapper/activiti/ActModelMapper.xml +++ b/skyeye-activiti/src/main/resources/mapper/activiti/ActModelMapper.xml @@ -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> diff --git a/skyeye-activiti/src/main/resources/reqmapping/mapping/activiti.xml b/skyeye-activiti/src/main/resources/reqmapping/mapping/activiti.xml index f2a1f69e9eb82b69c5828ae54ed4ff24c19c84d5..e33f5d877249f70958db0d07d512ba28bf7589b7 100644 --- a/skyeye-activiti/src/main/resources/reqmapping/mapping/activiti.xml +++ b/skyeye-activiti/src/main/resources/reqmapping/mapping/activiti.xml @@ -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" /> diff --git a/skyeye-common/src/main/java/com/skyeye/common/constans/ActivitiConstants.java b/skyeye-common/src/main/java/com/skyeye/common/constans/ActivitiConstants.java index 0424c7ec088c864ea1363d55f1465f60c6ea9190..d8b7f6061ad24dd5620fb540e473d626988e0b07 100644 --- a/skyeye-common/src/main/java/com/skyeye/common/constans/ActivitiConstants.java +++ b/skyeye-common/src/main/java/com/skyeye/common/constans/ActivitiConstants.java @@ -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 */