Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
Y
yn-health-science
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
徐俊
yn-health-science
Commits
d1878833
Commit
d1878833
authored
Dec 31, 2024
by
wangxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
3a313dd0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
CommonEnum.java
...main/java/com/yiboshi/science/enumeration/CommonEnum.java
+1
-1
ComProjectTaskController.java
...com/yiboshi/science/rest/v1/ComProjectTaskController.java
+1
-1
No files found.
science-admin/src/main/java/com/yiboshi/science/enumeration/CommonEnum.java
View file @
d1878833
...
...
@@ -418,7 +418,7 @@ public class CommonEnum {
* 任务书状态
*/
public
enum
taskState
implements
INumberEnum
{
noWrite
(
0
,
"未填"
),
noWrite
(
0
,
"未填
写
"
),
draft
(-
10
,
"起草"
),
waitSubmit
(
10
,
"待提交"
),
review
(
20
,
"审核中"
),
...
...
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectTaskController.java
View file @
d1878833
...
...
@@ -59,7 +59,7 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi
Pagination
<
ComProjectTaskDTO
>
page
=
ComProjectTaskService
.
getListByPage
(
vo
);
if
(
null
!=
page
&&
null
!=
page
.
getDataList
()
&&
page
.
getDataList
().
size
()
!=
0
)
{
page
.
getDataList
().
forEach
((
e
)
->
{
e
.
setTaskStateName
(
CommonEnum
.
proj
State
.
getEnum
(
e
.
getTaskState
()).
getDescription
());
e
.
setTaskStateName
(
CommonEnum
.
task
State
.
getEnum
(
e
.
getTaskState
()).
getDescription
());
});
}
return
ResponseDataModel
.
ok
(
page
);
...
...
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