diff --git a/src/main/java/com/lz/modules/performance/controller/ChartController.java b/src/main/java/com/lz/modules/performance/controller/ChartController.java new file mode 100644 index 00000000..381d0409 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -0,0 +1,30 @@ +package com.lz.modules.performance.controller; + +import com.lz.common.utils.R; +import com.lz.modules.performance.req.ChartResultReq; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/10/15 9:33 + */ +@RestController +@RequestMapping("/performance") +@Api(value="报表接口", tags={"报表统计"}) +public class ChartController { + + @PostMapping("chart/result") + public R chartResult(@RequestBody ChartResultReq req){ + return R.ok(); + } + + + + +} diff --git a/src/main/java/com/lz/modules/performance/controller/SmartPerformanceController.java b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java similarity index 80% rename from src/main/java/com/lz/modules/performance/controller/SmartPerformanceController.java rename to src/main/java/com/lz/modules/performance/controller/UserTaskController.java index 49019058..83f37106 100644 --- a/src/main/java/com/lz/modules/performance/controller/SmartPerformanceController.java +++ b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java @@ -24,6 +24,7 @@ import com.lz.modules.sys.service.app.ResultRecordService; import io.swagger.annotations.*; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -40,28 +41,20 @@ import java.util.function.Consumer; */ @RestController @RequestMapping("/performance") -@Api(value="智能绩效", tags={"智能绩效部分接口"}) -public class SmartPerformanceController extends AbstractController{ +@Api(value="事项接口", tags={"用户任务"}) +public class UserTaskController extends AbstractController{ @Autowired private AssessTaskService assessTaskService; - @RequestMapping("task/list") + @PostMapping("task/list") @ApiOperation("获取待办/处理事项") - @ApiImplicitParam(name = "status",value = "状态 (0:待办 1:已处理)", required = true, dataType = "int",paramType = "query") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskListRes.class)}) - public R list(AssessTaskReq req){ - assessTaskService.assessTaskList(req,getUserId()); - return R.ok().put("page",""); + public R list(@RequestBody @ApiParam(name = "body",value = "body请求体") AssessTaskReq req){ + PageUtils pageUtils = assessTaskService.assessTaskList(req, getUserId()); + return R.ok().put("page",pageUtils); } - @RequestMapping("chart/result") - public R chartResult(@RequestBody ChartResultReq req){ - return R.ok(); - } - - - @RequestMapping("assess/group/list") public R groupList(@RequestBody AssessListReq req){ diff --git a/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java b/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java index 41bfd27c..1a670f93 100644 --- a/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java +++ b/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java @@ -1,6 +1,8 @@ package com.lz.modules.performance.req; import com.lz.modules.equipment.entity.model.BasePage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -9,6 +11,8 @@ import lombok.Data; * @Date: 2020/10/14 11:38 */ @Data +@ApiModel(value = "获取用户任务实体") public class AssessTaskReq extends BasePage{ + @ApiModelProperty(value = "状态 (0:待办 1:已处理)", name = "status",required = true, dataType = "int") private int status; }