Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
jyzb_platformV2
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Members
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
赵剑炜
jyzb_platformV2
Commits
6efc2529
Commit
6efc2529
authored
Oct 08, 2023
by
赵剑炜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改发起人的返回参数
parent
39dd8186
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
20 行增加
和
7 行删除
+20
-7
ProcessUser.java
jyzb-process/src/main/java/com/junmp/junmpProcess/dto/json/ProcessUser.java
+8
-0
UserInfo.java
jyzb-process/src/main/java/com/junmp/junmpProcess/dto/json/UserInfo.java
+2
-0
FlowTaskServiceImpl.java
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java
+10
-7
没有找到文件。
jyzb-process/src/main/java/com/junmp/junmpProcess/dto/json/ProcessUser.java
0 → 100644
View file @
6efc2529
package
com
.
junmp
.
junmpProcess
.
dto
.
json
;
import
lombok.Data
;
@Data
public
class
ProcessUser
{
private
UserInfo
userInfo
;
}
jyzb-process/src/main/java/com/junmp/junmpProcess/dto/json/UserInfo.java
View file @
6efc2529
...
...
@@ -15,4 +15,6 @@ public class UserInfo {
private
String
type
;
private
String
sex
;
private
Boolean
selected
;
private
String
realName
;
}
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java
View file @
6efc2529
...
...
@@ -11,6 +11,7 @@ import com.junmp.junmpProcess.common.utils.HttpStatus;
import
com.junmp.junmpProcess.common.utils.ResponseResult
;
import
com.junmp.junmpProcess.common.utils.ReturnMsg
;
import
com.junmp.junmpProcess.dto.*
;
import
com.junmp.junmpProcess.dto.json.ProcessUser
;
import
com.junmp.junmpProcess.dto.json.UserInfo
;
import
com.junmp.junmpProcess.factory.FlowServiceFactory
;
import
com.junmp.junmpProcess.mapper.OrgUserMapper
;
...
...
@@ -240,15 +241,16 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
Page
<
TaskVO
>
page
=
new
Page
<>();
for
(
Task
task
:
tasks
)
{
ProcessInstance
processInstance
=
runtimeService
.
createProcessInstanceQuery
().
processInstanceId
(
task
.
getProcessInstanceId
()).
singleResult
();
String
startUserId
=
processInstance
.
getStartUserId
();
BpmnModel
bpmnModel
=
repositoryService
.
getBpmnModel
(
task
.
getProcessDefinitionId
());
Map
<
String
,
Object
>
processVariables
=
task
.
getProcessVariables
();
TaskVO
taskVO
=
new
TaskVO
();
taskVO
.
setTaskId
(
task
.
getId
());
taskVO
.
setProcessInstanceId
(
task
.
getProcessInstanceId
());
taskVO
.
setProcessDefinitionName
(
bpmnModel
.
getMainProcess
().
getName
());
SysUser
staruser
=
sysUserService
.
getById
(
startUserId
);
taskVO
.
setStartUser
(
this
.
SetUser
(
staruser
));
taskVO
.
setStartUser
(
JSONObject
.
parseObject
(
MapUtil
.
getStr
(
processVariables
,
START_USER_INFO
),
new
TypeReference
<
ProcessUser
>()
{
}).
getUserInfo
());
taskVO
.
setOrderId
(
MapUtil
.
getStr
(
processVariables
,
ORDER_ID
));
taskVO
.
setOrderType
(
MapUtil
.
getStr
(
processVariables
,
ORDER_TYPE
));
taskVO
.
setStartTime
(
processInstance
.
getStartTime
());
...
...
@@ -309,9 +311,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
{
taskVO
.
setProcessDefinitionName
(
bpmnModel
.
getMainProcess
().
getName
());
}
taskVO
.
setStartUser
(
JSONObject
.
parseObject
(
MapUtil
.
getStr
(
processVariables
,
START_USER_INFO
),
new
TypeReference
<
ProcessUser
>()
{
}).
getUserInfo
());
taskVO
.
setStartUser
(
JSONObject
.
parseObject
(
MapUtil
.
getStr
(
processVariables
,
START_USER_INFO
),
new
TypeReference
<
UserInfo
>()
{
}));
taskVO
.
setOrderId
(
MapUtil
.
getStr
(
processVariables
,
ORDER_ID
));
taskVO
.
setOrderType
(
MapUtil
.
getStr
(
processVariables
,
ORDER_TYPE
));
taskVO
.
setStartTime
(
historicProcessInstance
.
getStartTime
());
...
...
@@ -373,8 +375,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
historyProcessInstanceVO
.
setOrderId
(
MapUtil
.
getStr
(
processVariables
,
ORDER_ID
));
historyProcessInstanceVO
.
setOrderType
(
MapUtil
.
getStr
(
processVariables
,
ORDER_TYPE
));
historyProcessInstanceVO
.
setProcessDefinitionName
(
historicProcessInstance
.
getProcessDefinitionName
());
historyProcessInstanceVO
.
setStartUser
(
JSONObject
.
parseObject
(
MapUtil
.
getStr
(
processVariables
,
START_USER_INFO
),
new
TypeReference
<
UserInfo
>()
{
}));
historyProcessInstanceVO
.
setStartUser
(
JSONObject
.
parseObject
(
MapUtil
.
getStr
(
processVariables
,
START_USER_INFO
),
new
TypeReference
<
ProcessUser
>()
{
}).
getUserInfo
());
// historyProcessInstanceVO.setStartUser(StartUser)
historyProcessInstanceVO
.
setStartTime
(
historicProcessInstance
.
getStartTime
());
historyProcessInstanceVO
.
setEndTime
(
historicProcessInstance
.
getEndTime
());
Boolean
flag
=
historicProcessInstance
.
getEndTime
()
==
null
?
false
:
true
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论