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
03c5aa75
Commit
03c5aa75
authored
Mar 13, 2020
by
chenweisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
61db7611
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
12 deletions
+8
-12
IndexCtrl.java
src/main/java/com/keymobile/rest/ctrl/IndexCtrl.java
+4
-12
Job.java
src/main/java/com/keymobile/rest/model/Job.java
+4
-0
No files found.
src/main/java/com/keymobile/rest/ctrl/IndexCtrl.java
View file @
03c5aa75
...
@@ -85,7 +85,7 @@ public class IndexCtrl {
...
@@ -85,7 +85,7 @@ public class IndexCtrl {
public
ApiResponse
getMyTasks
()
{
public
ApiResponse
getMyTasks
()
{
User
user
=
userService
.
getNormalUser
();
User
user
=
userService
.
getNormalUser
();
User
audit
=
userService
.
getAudit
();
User
audit
=
userService
.
getAudit
();
List
<
Map
>
jobList
=
new
ArrayList
<>();
List
<
Job
>
jobList
=
new
ArrayList
<>();
// 获取任务
// 获取任务
List
<
Task
>
tasks
=
taskService
.
createNativeTaskQuery
()
List
<
Task
>
tasks
=
taskService
.
createNativeTaskQuery
()
.
sql
(
"SELECT * FROM "
+
managementService
.
getTableName
(
Task
.
class
)
+
" T WHERE T.ASSIGNEE_ = #{assignee1} OR T.ASSIGNEE_ = #{assignee2}"
)
.
sql
(
"SELECT * FROM "
+
managementService
.
getTableName
(
Task
.
class
)
+
" T WHERE T.ASSIGNEE_ = #{assignee1} OR T.ASSIGNEE_ = #{assignee2}"
)
...
@@ -96,20 +96,12 @@ public class IndexCtrl {
...
@@ -96,20 +96,12 @@ public class IndexCtrl {
String
processId
=
task
.
getProcessInstanceId
();
String
processId
=
task
.
getProcessInstanceId
();
Job
job
=
jobService
.
findByProcessId
(
processId
);
Job
job
=
jobService
.
findByProcessId
(
processId
);
if
(
job
!=
null
&&
job
.
getStatus
()
!=
Job
.
STATUS_COMPLETED
)
{
if
(
job
!=
null
&&
job
.
getStatus
()
!=
Job
.
STATUS_COMPLETED
)
{
Map
map
=
new
HashMap
();
if
(
task
.
getTaskDefinitionKey
().
equals
(
"addData"
))
{
if
(
task
.
getTaskDefinitionKey
().
equals
(
"addData"
))
{
map
.
put
(
"kind"
,
Job
.
KIND_RECORD
);
job
.
setKind
(
Job
.
KIND_RECORD
);
}
else
{
}
else
{
map
.
put
(
"kind"
,
Job
.
KIND_AUDIT
);
job
.
setKind
(
Job
.
KIND_AUDIT
);
}
}
map
.
put
(
"taskId"
,
job
.
getId
());
jobList
.
add
(
job
);
if
(
job
.
getExcelList
().
size
()
>
0
)
{
Excel
excel
=
job
.
getExcelList
().
get
(
0
);
map
.
put
(
"excelId"
,
excel
.
getId
());
map
.
put
(
"config"
,
excel
.
getConfig
());
map
.
put
(
"name"
,
excel
.
getName
());
}
jobList
.
add
(
map
);
}
}
}
}
...
...
src/main/java/com/keymobile/rest/model/Job.java
View file @
03c5aa75
...
@@ -73,4 +73,8 @@ public class Job implements Serializable {
...
@@ -73,4 +73,8 @@ public class Job implements Serializable {
@ManyToOne
@ManyToOne
private
User
user
;
private
User
user
;
@Transient
private
int
kind
;
}
}
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