Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doc_wei
Skyeye
提交
4974c1e7
S
Skyeye
项目概览
doc_wei
/
Skyeye
通知
1197
Star
154
Fork
127
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Skyeye
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
4974c1e7
编写于
3年前
作者:
doc_wei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
动态表单选择审批人整改完成
上级
7171e0ae
company_server
无相关合并请求
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
5 addition
and
7 deletion
+5
-7
skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/DsFormActivitiServiceImpl.java
...yeye/activiti/service/impl/DsFormActivitiServiceImpl.java
+1
-2
skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java
.../com/skyeye/eve/service/impl/PageSequenceServiceImpl.java
+1
-2
skyeye-activiti/src/main/resources/mapper/activiti/ActModelMapper.xml
...iti/src/main/resources/mapper/activiti/ActModelMapper.xml
+1
-1
skyeye-activiti/src/main/resources/reqmapping/mapping/activiti.xml
...tiviti/src/main/resources/reqmapping/mapping/activiti.xml
+2
-0
skyeye-common/src/main/java/com/skyeye/common/constans/ActivitiConstants.java
...in/java/com/skyeye/common/constans/ActivitiConstants.java
+0
-2
未找到文件。
skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/DsFormActivitiServiceImpl.java
浏览文件 @
4974c1e7
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java
浏览文件 @
4974c1e7
...
...
@@ -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"
));
...
...
This diff is collapsed.
Click to expand it.
skyeye-activiti/src/main/resources/mapper/activiti/ActModelMapper.xml
浏览文件 @
4974c1e7
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
skyeye-activiti/src/main/resources/reqmapping/mapping/activiti.xml
浏览文件 @
4974c1e7
...
...
@@ -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"
/>
...
...
This diff is collapsed.
Click to expand it.
skyeye-common/src/main/java/com/skyeye/common/constans/ActivitiConstants.java
浏览文件 @
4974c1e7
...
...
@@ -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
*/
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部