Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

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();
+    }
+}

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 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.assessTaskList(req, getUserId());
+        PageUtils pageUtils = assessService.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();
-    }
-
 }

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 {
+public interface AssessService {
-    PageUtils assessTaskList(AssessTaskReq req,Long userId);
+    PageUtils userTaskList(AssessTaskReq req,Long userId);
 
     List<ChartStatisticalRes> chartResult(ChartResultReq req);
 }

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;
@@ -26,8 +26,8 @@ import java.util.Optional;
  * @Desc:
  * @Date: 2020/10/14 14:59
  */
-@Service("assessTaskService")
+@Service("assessService")
-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<TaskListRes> list = new ArrayList<>();
         PageUtils pageUtils = flowRecordService.selectTaskListByApprovalStaffId(req,userId);