Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vehicle-quality-review
Project
Project
Details
Activity
Releases
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
王飞
vehicle-quality-review
Commits
fa2f6df6
Commit
fa2f6df6
authored
1 year ago
by
王飞
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wangdingyi' into 'dev'
审核通过任务&审核驳回任务 See merge request
!10
parents
c13e3b1d
02966698
dev
gaixiankang
gaoying
master
songyuanshuo
wangdingyi
wangfei
19.0
18.0
17.0
16.0
15.0
14.0
13.0
12.0
11.0
10.0
9.0
8.0
7.0
6.0
5.0
4.0
3.0
2.0
1.0
1 merge request
!211
dev - master
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
0 deletions
+34
-0
ReviewSceneChangeTaskController.java
...n/java/com/ruoyi/web/ReviewSceneChangeTaskController.java
+23
-0
ReviewSceneChangeTaskPassRequest.java
...m/ruoyi/web/request/ReviewSceneChangeTaskPassRequest.java
+11
-0
No files found.
quality-review/src/main/java/com/ruoyi/web/ReviewSceneChangeTaskController.java
View file @
fa2f6df6
...
...
@@ -9,6 +9,7 @@ import com.ruoyi.common.utils.bean.BeanUtils;
import
com.ruoyi.domain.ReviewSceneChangeTask
;
import
com.ruoyi.service.ReviewSceneChangeTaskService
;
import
com.ruoyi.web.request.ReviewSceneChangeTaskCreateRequest
;
import
com.ruoyi.web.request.ReviewSceneChangeTaskPassRequest
;
import
org.apache.skywalking.apm.toolkit.trace.Tag
;
import
org.apache.skywalking.apm.toolkit.trace.Tags
;
import
org.apache.skywalking.apm.toolkit.trace.Trace
;
...
...
@@ -39,6 +40,28 @@ public class ReviewSceneChangeTaskController extends BaseController {
return
success
();
}
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@Log
(
title
=
"审核通过任务"
,
businessType
=
BusinessType
.
UPDATE
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/pass"
)
public
AjaxResult
pass
(
@Validated
@RequestBody
ReviewSceneChangeTaskPassRequest
request
)
{
reviewSceneChangeTaskService
.
pass
(
request
.
getTaskId
(),
request
.
getComment
());
return
success
();
}
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@Log
(
title
=
"审核驳回任务"
,
businessType
=
BusinessType
.
UPDATE
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/reject"
)
public
AjaxResult
reject
(
@Validated
@RequestBody
ReviewSceneChangeTaskPassRequest
request
)
{
reviewSceneChangeTaskService
.
reject
(
request
.
getTaskId
(),
request
.
getComment
());
return
success
();
}
/**
* 根据用户ID查询待办列表
* @return
...
...
This diff is collapsed.
Click to expand it.
quality-review/src/main/java/com/ruoyi/web/request/ReviewSceneChangeTaskPassRequest.java
0 → 100644
View file @
fa2f6df6
package
com
.
ruoyi
.
web
.
request
;
import
lombok.Data
;
@Data
public
class
ReviewSceneChangeTaskPassRequest
{
private
Long
taskId
;
private
String
comment
;
}
This diff is collapsed.
Click to expand it.
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