diff --git a/research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java b/research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java index ba247013..91a08ee8 100644 --- a/research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java +++ b/research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java @@ -46,6 +46,12 @@ public class TaskController { return JsonResponse.ok(new PageInfo<>(taskService.queryList(query.getParam()))); } + @ApiOperation(value = "查询任务") + @RequestMapping(value = "/queryListClient", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryListClient(@ApiParam @Validated @RequestBody BaseDto query){ + return JsonResponse.ok(taskService.queryListClient(query.getParam())); + } + @ApiOperation(value = "查询任务") @RequestMapping(value = "/detail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse detail(@ApiParam @Validated @RequestBody TaskDto.QueryDetail dto){ @@ -112,4 +118,11 @@ public class TaskController { return JsonResponse.ok(); } + @ApiOperation(value = "交付物审核") + @RequestMapping(value = "/aduitDeliverable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse aduit(@ApiParam @Validated @RequestBody TaskDto.AduitDeliverable dto){ + taskService.aduit(dto.getTaskId(), dto.getDeliverableId(), dto.getStatus()); + return JsonResponse.ok(); + } + } diff --git a/research-generator/src/main/resources/mbg.xml b/research-generator/src/main/resources/mbg.xml index ec96541f..9cfdfb21 100644 --- a/research-generator/src/main/resources/mbg.xml +++ b/research-generator/src/main/resources/mbg.xml @@ -80,13 +80,13 @@ - + - +