Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
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
项目统一框架
amos-boot-biz
Commits
833c1127
Commit
833c1127
authored
Jul 31, 2023
by
litengwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码提交
parent
9ad9bd82
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
ProjectInitiationEnum.java
.../amos/boot/module/ugp/api/Enum/ProjectInitiationEnum.java
+6
-6
Task.java
...ava/com/yeejoin/amos/boot/module/ugp/api/entity/Task.java
+5
-0
TaskController.java
...n/amos/boot/module/ugp/biz/controller/TaskController.java
+2
-0
No files found.
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/ProjectInitiationEnum.java
View file @
833c1127
...
...
@@ -17,12 +17,12 @@ public enum ProjectInitiationEnum {
设计资料审核
(
""
,
"设计资料审核"
,
"SJZISH"
,
"设计资料待审核"
,
"设计资料审核"
,
"待审核"
),
设计资料审批
(
""
,
"设计资料审批"
,
"SJZISP"
,
"设计资料待审批"
,
"设计资料审批"
,
"待审批"
),
建设负责人指定项目负责人
(
""
,
"建设负责人分配项目负责人"
,
""
,
"建设负责人分配项目负责人"
,
"
"
,
"
"
),
建设负责人指定项目资料员
(
""
,
"建设项目负责人分配项目资料员"
,
""
,
"建设项目负责人分配项目资料员"
,
"
"
,
"
"
),
设计负责人指定项目负责人
(
""
,
"设计负责人分配项目负责人"
,
""
,
"设计负责人分配项目负责人"
,
"
"
,
"
"
),
设计负责人指定项目资料员
(
""
,
"设计项目负责人分配资料员"
,
""
,
"设计项目负责人分配资料员"
,
"
"
,
"
"
),
安装负责人指定项目负责人
(
""
,
"安装负责人分配项目负责人"
,
""
,
"安装负责人分配项目负责人"
,
"
"
,
"
"
),
安装负责人指定项目资料员
(
""
,
"安装项目负责人分配资料员"
,
""
,
"安装项目负责人分配资料员"
,
"
"
,
"
"
),
建设负责人指定项目负责人
(
""
,
"建设负责人分配项目负责人"
,
""
,
"建设负责人分配项目负责人"
,
"
建设负责人分配项目负责人"
,
"待审核
"
),
建设负责人指定项目资料员
(
""
,
"建设项目负责人分配项目资料员"
,
""
,
"建设项目负责人分配项目资料员"
,
"
建设项目负责人分配项目资料员"
,
"待审核
"
),
设计负责人指定项目负责人
(
""
,
"设计负责人分配项目负责人"
,
""
,
"设计负责人分配项目负责人"
,
"
设计负责人分配项目负责人"
,
"待审核
"
),
设计负责人指定项目资料员
(
""
,
"设计项目负责人分配资料员"
,
""
,
"设计项目负责人分配资料员"
,
"
设计项目负责人分配资料员"
,
"待审核
"
),
安装负责人指定项目负责人
(
""
,
"安装负责人分配项目负责人"
,
""
,
"安装负责人分配项目负责人"
,
"
安装负责人分配项目负责人"
,
"待审核
"
),
安装负责人指定项目资料员
(
""
,
"安装项目负责人分配资料员"
,
""
,
"安装项目负责人分配资料员"
,
"
安装项目负责人分配资料员"
,
"待审核
"
),
提交指定
(
"6"
,
"提交指定"
,
"TJZL"
,
""
,
""
,
""
),
安装资料审核
(
""
,
"安装资料审核"
,
"AZZLSH"
,
"安装资料待审核"
,
"安装资料审核"
,
"待审核"
),
...
...
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/Task.java
View file @
833c1127
...
...
@@ -65,6 +65,11 @@ public class Task extends BaseEntity {
private
String
roleIds
;
private
String
instanceId
;
@TableField
(
exist
=
false
)
private
String
value
;
//url路径
@TableField
(
exist
=
false
)
private
String
label
;
...
...
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/TaskController.java
View file @
833c1127
...
...
@@ -194,6 +194,8 @@ public class TaskController {
page
=
taskMapper
.
getTask
(
page
,
status
,
unitId
,
roleIds
);
List
<
Task
>
list
=
page
.
getRecords
();
for
(
Task
task
:
list
){
task
.
setLabel
(
task
.
getContent
());
task
.
setValue
(
task
.
getExtend
()+
"&sequenceNbr="
+
task
.
getSourceId
());
if
(
task
.
getStatus
()
==
1
){
if
(!
ValidationUtil
.
isEmpty
(
task
.
getExtendId
())){
if
(
task
.
getExtendId
()!=-
1L
)
{
...
...
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