From 21f564ef875d1f1dd577ccd679228870b1d8668f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 20 Oct 2020 17:36:37 +0800 Subject: [PATCH 1/2] fix --- .../controller/AssessManagerController.java | 29 +++++++++++++++++++ .../controller/UserTaskController.java | 24 ++------------- ...essTaskService.java => AssessService.java} | 4 +-- ...erviceImpl.java => AssessServiceImpl.java} | 6 ++-- 4 files changed, 37 insertions(+), 26 deletions(-) create mode 100644 src/main/java/com/lz/modules/performance/controller/AssessManagerController.java rename src/main/java/com/lz/modules/performance/service/{AssessTaskService.java => AssessService.java} (80%) rename src/main/java/com/lz/modules/performance/service/impl/{AssessTaskServiceImpl.java => AssessServiceImpl.java} (93%) diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java new file mode 100644 index 00000000..41d70282 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -0,0 +1,29 @@ +package com.lz.modules.performance.controller; + +import com.lz.common.utils.R; +import com.lz.modules.performance.req.AssessDetailReq; +import com.lz.modules.performance.req.AssessListReq; +import com.lz.modules.performance.res.ChartStatisticalRes; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/10/20 17:33 + */ +public class AssessManagerController { + + + @RequestMapping("assess/group/list") + public R groupList(@RequestBody AssessListReq req){ + ChartStatisticalRes res = new ChartStatisticalRes(); + return R.ok(); + } + + @RequestMapping("assess/group/detail") + public R groupDetail(@RequestBody AssessDetailReq req){ + ChartStatisticalRes res = new ChartStatisticalRes(); + 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 3a614369..114046a5 100644 --- a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java @@ -2,12 +2,9 @@ package com.lz.modules.performance.controller; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; -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.res.ChartStatisticalRes; import com.lz.modules.performance.res.TaskListRes; -import com.lz.modules.performance.service.AssessTaskService; +import com.lz.modules.performance.service.AssessService; import com.lz.modules.sys.controller.AbstractController; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; @@ -26,28 +23,13 @@ import org.springframework.web.bind.annotation.RestController; @Api(value="事项接口", tags={"用户任务"}) public class UserTaskController extends AbstractController{ @Autowired - private AssessTaskService assessTaskService; + private AssessService assessTaskService; @PostMapping("task/list") @ApiOperation("获取待办/处理事项") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskListRes.class)}) public R list(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) AssessTaskReq req){ - PageUtils pageUtils = assessTaskService.assessTaskList(req, getUserId()); + PageUtils pageUtils = assessTaskService.userTaskList(req, getUserId()); return R.ok().put("data",pageUtils); } - - - - @RequestMapping("assess/group/list") - public R groupList(@RequestBody AssessListReq req){ - ChartStatisticalRes res = new ChartStatisticalRes(); - return R.ok(); - } - - @RequestMapping("assess/group/detail") - public R groupDetail(@RequestBody AssessDetailReq req){ - ChartStatisticalRes res = new ChartStatisticalRes(); - return R.ok(); - } - } diff --git a/src/main/java/com/lz/modules/performance/service/AssessTaskService.java b/src/main/java/com/lz/modules/performance/service/AssessService.java similarity index 80% rename from src/main/java/com/lz/modules/performance/service/AssessTaskService.java rename to src/main/java/com/lz/modules/performance/service/AssessService.java index 5a468673..d303ddbb 100644 --- a/src/main/java/com/lz/modules/performance/service/AssessTaskService.java +++ b/src/main/java/com/lz/modules/performance/service/AssessService.java @@ -12,8 +12,8 @@ import java.util.List; * @Desc: * @Date: 2020/10/14 14:58 */ -public interface AssessTaskService { - PageUtils assessTaskList(AssessTaskReq req,Long userId); +public interface AssessService { + PageUtils userTaskList(AssessTaskReq req,Long userId); List chartResult(ChartResultReq req); } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java similarity index 93% rename from src/main/java/com/lz/modules/performance/service/impl/AssessTaskServiceImpl.java rename to src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java index 6bd7aebd..7cedfaf6 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java @@ -12,7 +12,7 @@ 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.performance.service.AssessService; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,7 +27,7 @@ import java.util.Optional; * @Date: 2020/10/14 14:59 */ @Service("assessTaskService") -public class AssessTaskServiceImpl implements AssessTaskService { +public class AssessServiceImpl implements AssessService { @Autowired private FlowRecordService flowRecordService; @Autowired @@ -36,7 +36,7 @@ public class AssessTaskServiceImpl implements AssessTaskService { private FlowChangeService flowChangeService; @Override - public PageUtils assessTaskList(AssessTaskReq req,Long userId) { + public PageUtils userTaskList(AssessTaskReq req,Long userId) { PageUtils data = new PageUtils(); List list = new ArrayList<>(); PageUtils pageUtils = flowRecordService.selectTaskListByApprovalStaffId(req,userId); From 8dc443e1cce3cbb7baec3b483efefe1a40b62bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 20 Oct 2020 17:38:35 +0800 Subject: [PATCH 2/2] fix --- .../lz/modules/performance/controller/UserTaskController.java | 4 ++-- .../modules/performance/service/impl/AssessServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 114046a5..cd99b4d5 100644 --- a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java @@ -23,13 +23,13 @@ import org.springframework.web.bind.annotation.RestController; @Api(value="事项接口", tags={"用户任务"}) public class UserTaskController extends AbstractController{ @Autowired - private AssessService assessTaskService; + private AssessService assessService; @PostMapping("task/list") @ApiOperation("获取待办/处理事项") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskListRes.class)}) public R list(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) AssessTaskReq req){ - PageUtils pageUtils = assessTaskService.userTaskList(req, getUserId()); + PageUtils pageUtils = assessService.userTaskList(req, getUserId()); return R.ok().put("data",pageUtils); } } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java index 7cedfaf6..e5f6e91e 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java @@ -26,7 +26,7 @@ import java.util.Optional; * @Desc: * @Date: 2020/10/14 14:59 */ -@Service("assessTaskService") +@Service("assessService") public class AssessServiceImpl implements AssessService { @Autowired private FlowRecordService flowRecordService;