Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
datacollector
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenweisong
datacollector
Commits
b70b8d58
Commit
b70b8d58
authored
Apr 03, 2020
by
chenweisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
75c3092a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
TaskController.java
...in/java/com/keymobile/rest/controller/TaskController.java
+5
-1
Mission.java
src/main/java/com/keymobile/rest/vo/Mission.java
+3
-1
No files found.
src/main/java/com/keymobile/rest/controller/TaskController.java
View file @
b70b8d58
...
@@ -120,7 +120,7 @@ public class TaskController {
...
@@ -120,7 +120,7 @@ public class TaskController {
// 组id
// 组id
String
groupId
=
"id:"
+
templateId
;
String
groupId
=
"id:"
+
templateId
;
if
(
groupId
.
equals
(
identityLink
.
getGroupId
()))
{
if
(
groupId
.
equals
(
identityLink
.
getGroupId
()))
{
missions
.
add
(
convertTaskToMission
(
groupTask
,
ImmutableMap
.
of
(
"username"
,
username
,
"type"
,
CtrlConstant
.
TASK_TYPE_GROUP
,
"templateId"
,
templateId
)));
missions
.
add
(
convertTaskToMission
(
groupTask
,
ImmutableMap
.
of
(
"username"
,
username
,
"type"
,
CtrlConstant
.
TASK_TYPE_GROUP
,
"templateId"
,
templateId
,
"config"
,
template
.
getConfig
()
)));
}
}
});
});
}
}
...
@@ -339,17 +339,21 @@ public class TaskController {
...
@@ -339,17 +339,21 @@ public class TaskController {
missionType
=
CtrlConstant
.
MISSION_TYPE_DATA_ENTER
;
missionType
=
CtrlConstant
.
MISSION_TYPE_DATA_ENTER
;
mission
=
CtrlConstant
.
MISSION_TEXT_DATA_ENTER
;
mission
=
CtrlConstant
.
MISSION_TEXT_DATA_ENTER
;
long
templateId
=
0
;
long
templateId
=
0
;
String
config
=
""
;
if
(
type
==
CtrlConstant
.
TASK_TYPE_PERSONAL
)
{
if
(
type
==
CtrlConstant
.
TASK_TYPE_PERSONAL
)
{
String
assignee
=
task
.
getAssignee
();
String
assignee
=
task
.
getAssignee
();
String
[]
array
=
assignee
.
split
(
":"
);
String
[]
array
=
assignee
.
split
(
":"
);
try
{
try
{
templateId
=
Long
.
parseLong
(
array
[
1
]);
templateId
=
Long
.
parseLong
(
array
[
1
]);
config
=
""
;
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
}
}
}
else
if
(
type
==
CtrlConstant
.
TASK_TYPE_GROUP
)
{
}
else
if
(
type
==
CtrlConstant
.
TASK_TYPE_GROUP
)
{
templateId
=
Long
.
parseLong
(
params
.
get
(
"templateId"
).
toString
());
templateId
=
Long
.
parseLong
(
params
.
get
(
"templateId"
).
toString
());
config
=
params
.
get
(
"config"
).
toString
();
}
}
builder
.
config
(
config
);
builder
.
excelId
(
templateId
);
builder
.
excelId
(
templateId
);
}
else
if
(
task
.
getTaskDefinitionKey
().
equals
(
CtrlConstant
.
MISSION_KEY_DATA_AUDIT
))
{
}
else
if
(
task
.
getTaskDefinitionKey
().
equals
(
CtrlConstant
.
MISSION_KEY_DATA_AUDIT
))
{
missionType
=
CtrlConstant
.
MISSION_TYPE_DATA_AUDIT
;
missionType
=
CtrlConstant
.
MISSION_TYPE_DATA_AUDIT
;
...
...
src/main/java/com/keymobile/rest/vo/Mission.java
View file @
b70b8d58
...
@@ -21,8 +21,10 @@ public class Mission {
...
@@ -21,8 +21,10 @@ public class Mission {
private
int
missionType
;
private
int
missionType
;
@ApiModelProperty
(
name
=
"mission"
,
value
=
"任务名称"
)
@ApiModelProperty
(
name
=
"mission"
,
value
=
"任务名称"
)
private
String
mission
;
private
String
mission
;
@ApiModelProperty
(
name
=
"excelId"
,
value
=
"模板id(前身为excelList[0])"
)
@ApiModelProperty
(
name
=
"excelId"
,
value
=
"模板id(前身为excelList[0]
.id
)"
)
private
long
excelId
;
private
long
excelId
;
@ApiModelProperty
(
name
=
"config"
,
value
=
"模板配置(前身为excelList[0].config)"
)
private
String
config
;
@ApiModelProperty
(
name
=
"processId"
,
value
=
"流程实例id 补录任务需要用到"
)
@ApiModelProperty
(
name
=
"processId"
,
value
=
"流程实例id 补录任务需要用到"
)
private
String
processId
;
private
String
processId
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment