Commit fa2f6df6 authored by 王飞's avatar 王飞

Merge branch 'wangdingyi' into 'dev'

审核通过任务&审核驳回任务

See merge request !10
parents c13e3b1d 02966698
...@@ -9,6 +9,7 @@ import com.ruoyi.common.utils.bean.BeanUtils; ...@@ -9,6 +9,7 @@ import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.domain.ReviewSceneChangeTask; import com.ruoyi.domain.ReviewSceneChangeTask;
import com.ruoyi.service.ReviewSceneChangeTaskService; import com.ruoyi.service.ReviewSceneChangeTaskService;
import com.ruoyi.web.request.ReviewSceneChangeTaskCreateRequest; 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.Tag;
import org.apache.skywalking.apm.toolkit.trace.Tags; import org.apache.skywalking.apm.toolkit.trace.Tags;
import org.apache.skywalking.apm.toolkit.trace.Trace; import org.apache.skywalking.apm.toolkit.trace.Trace;
...@@ -39,6 +40,28 @@ public class ReviewSceneChangeTaskController extends BaseController { ...@@ -39,6 +40,28 @@ public class ReviewSceneChangeTaskController extends BaseController {
return success(); 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查询待办列表 * 根据用户ID查询待办列表
* @return * @return
......
package com.ruoyi.web.request;
import lombok.Data;
@Data
public class ReviewSceneChangeTaskPassRequest {
private Long taskId;
private String comment;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment