Commit 8a361f8c762e52fc6c0051d83f8c5baefe95b49b

Authored by 姜超
1 parent 601b158c

feature(*): 修改个人考评

修改个人考评
fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java
@@ -71,23 +71,6 @@ public class EvalPoolController { @@ -71,23 +71,6 @@ public class EvalPoolController {
71 } 71 }
72 72
73 /** 73 /**
74 - * 人员信息  
75 - *  
76 - * @return  
77 - * @ignoreParams currentUser  
78 - */  
79 - @GetMapping("/staff-info")  
80 - @ControllerMethod("人员信息")  
81 - public Message<EvalUserPoolVO> queryUser(@CurrentUser LoginAuthBean user) {  
82 - EvalUserPoolVO poolVO = new EvalUserPoolVO();  
83 - if (PublicUtil.isNotEmpty(user)) {  
84 - poolVO.setUserId(user.getUserId());  
85 - poolVO.setUserName(user.getUserName());  
86 - }  
87 - return success(poolVO);  
88 - }  
89 -  
90 - /**  
91 * 本月可查看的其他考评池选项 74 * 本月可查看的其他考评池选项
92 * 75 *
93 * @param user 用户id 76 * @param user 用户id
@@ -107,7 +90,8 @@ public class EvalPoolController { @@ -107,7 +90,8 @@ public class EvalPoolController {
107 if (Objects.isNull(userId)) { 90 if (Objects.isNull(userId)) {
108 userId = user.getUserId(); 91 userId = user.getUserId();
109 } 92 }
110 - return success(evalGroupPoolService.evalPoolSelector(userId, monthly)); 93 +// return success(evalGroupPoolService.evalPoolSelector(userId, monthly));
  94 + return success();
111 } 95 }
112 96
113 /** 97 /**
@@ -119,7 +103,8 @@ public class EvalPoolController { @@ -119,7 +103,8 @@ public class EvalPoolController {
119 @Valid EvalUserRankDTO dto) { 103 @Valid EvalUserRankDTO dto) {
120 dto.initMonthly(); 104 dto.initMonthly();
121 dto.setUserId(userId); 105 dto.setUserId(userId);
122 - return success(evalGroupPoolService.queryRankStagePools(dto)); 106 +// return success(evalGroupPoolService.queryRankStagePools(dto));
  107 + return success();
123 } 108 }
124 109
125 /** 110 /**
@@ -133,7 +118,8 @@ public class EvalPoolController { @@ -133,7 +118,8 @@ public class EvalPoolController {
133 if (PublicUtil.isEmpty(dto.getUserId())) { 118 if (PublicUtil.isEmpty(dto.getUserId())) {
134 throw new BusinessException("人员信息不能为空"); 119 throw new BusinessException("人员信息不能为空");
135 } 120 }
136 - return success(evalGroupPoolService.queryRankStagePools(dto)); 121 +// return success(evalGroupPoolService.queryRankStagePools(dto));
  122 + return success();
137 } 123 }
138 124
139 /** 125 /**