diff --git a/src/main/java/com/lz/modules/performance/controller/ChartController.java b/src/main/java/com/lz/modules/performance/controller/ChartController.java index 381d0409..a6444683 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -2,8 +2,10 @@ 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 com.lz.modules.performance.res.ChartStatisticalRes; +import com.lz.modules.performance.res.TaskListRes; +import com.lz.modules.sys.controller.AbstractController; +import io.swagger.annotations.*; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,11 +18,13 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("/performance") -@Api(value="报表接口", tags={"报表统计"}) -public class ChartController { +//@Api(value="报表接口", tags={"报表统计"}) +public class ChartController extends AbstractController{ @PostMapping("chart/result") - public R chartResult(@RequestBody ChartResultReq req){ + @ApiOperation("获取待办/处理事项") + @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatisticalRes.class)}) + public R chartResult(@RequestBody @ApiParam(name = "body",value = "body请求体") ChartResultReq req){ return R.ok(); } diff --git a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java index 83f37106..89316140 100644 --- a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java @@ -1,39 +1,21 @@ package com.lz.modules.performance.controller; -import com.lz.common.utils.DateUtils; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; -import com.lz.common.utils.StringUtil; -import com.lz.modules.app.entity.StaffEntity; -import com.lz.modules.app.service.StaffService; -import com.lz.modules.equipment.entity.model.BasePage; -import com.lz.modules.flow.entity.FlowChart; -import com.lz.modules.flow.service.FlowChangeService; -import com.lz.modules.flow.service.FlowRecordService; -import com.lz.modules.performance.dto.TaskListDto; import com.lz.modules.performance.req.AssessDetailReq; import com.lz.modules.performance.req.AssessListReq; import com.lz.modules.performance.req.AssessTaskReq; -import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.performance.res.TaskListRes; import com.lz.modules.performance.service.AssessTaskService; import com.lz.modules.sys.controller.AbstractController; -import com.lz.modules.sys.entity.app.ResultRecord; -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; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.function.Consumer; - /** * @Author: djc * @Desc: @@ -49,7 +31,7 @@ public class UserTaskController extends AbstractController{ @PostMapping("task/list") @ApiOperation("获取待办/处理事项") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskListRes.class)}) - public R list(@RequestBody @ApiParam(name = "body",value = "body请求体") AssessTaskReq req){ + public R list(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) AssessTaskReq req){ PageUtils pageUtils = assessTaskService.assessTaskList(req, getUserId()); return R.ok().put("page",pageUtils); } 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 1a670f93..697cf389 100644 --- a/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java +++ b/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java @@ -14,5 +14,5 @@ import lombok.Data; @ApiModel(value = "获取用户任务实体") public class AssessTaskReq extends BasePage{ @ApiModelProperty(value = "状态 (0:待办 1:已处理)", name = "status",required = true, dataType = "int") - private int status; + private int status = 0; }