wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
杜建超 2020-11-12 09:50:13 +08:00
parent dfbd14a568
commit 0efa107ef7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/lz/modules/performance/controller/ChartController.java
View File

@ -52,7 +52,7 @@ public class ChartController extends AbstractController{
chartStatisticalRes = chartResultService.chartReport(startId,userId); chartStatisticalRes = chartResultService.chartReport(startId,userId);
} catch (Exception e) { } catch (Exception e) {
log.error("获取绩效报表统计异常" ,e); log.error("获取绩效报表统计异常" ,e);
return R.error(); return R.error(e.getMessage());
} }
return R.ok().put("data",chartStatisticalRes); return R.ok().put("data",chartStatisticalRes);
} }
@ -62,12 +62,12 @@ public class ChartController extends AbstractController{
@ApiOperation("获取考核类型列表") @ApiOperation("获取考核类型列表")
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStartsRes.class)}) @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStartsRes.class)})
public R chartStarts(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true)ChartStartsReq req){ public R chartStarts(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true)ChartStartsReq req){
PageUtils pageUtils = null; PageUtils pageUtils;
try { try {
pageUtils = chartResultService.chartStarts(req); pageUtils = chartResultService.chartStarts(req);
} catch (Exception e) { } catch (Exception e) {
log.error("获取考核类型列表异常" ,e); log.error("获取考核类型列表异常" ,e);
return R.error(); return R.error(e.getMessage());
} }
return R.ok().put("data",pageUtils); return R.ok().put("data",pageUtils);
} }
@ -77,14 +77,14 @@ public class ChartController extends AbstractController{
@ApiOperation("获取报表等级详情") @ApiOperation("获取报表等级详情")
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultRankListRes.class)}) @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultRankListRes.class)})
public R chartDetailList(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){ public R chartDetailList(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){
PageUtils pageUtils = null; PageUtils pageUtils;
try { try {
Long userId = getUserId(); Long userId = getUserId();
req.setLoginUserId(userId); req.setLoginUserId(userId);
pageUtils = chartResultService.selectChartDetailList(req); pageUtils = chartResultService.selectChartDetailList(req);
} catch (Exception e) { } catch (Exception e) {
log.error("获取报表等级详情异常" ,e); log.error("获取报表等级详情异常" ,e);
return R.error(); return R.error(e.getMessage());
} }
return R.ok().put("data",pageUtils); return R.ok().put("data",pageUtils);
} }

4
src/main/java/com/lz/modules/performance/controller/UserTaskController.java
View File

@ -31,13 +31,13 @@ public class UserTaskController extends AbstractController{
@ApiOperation("获取待办/处理事项") @ApiOperation("获取待办/处理事项")
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskListRes.class)}) @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskListRes.class)})
public R list(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) AssessTaskReq req){ public R list(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) AssessTaskReq req){
PageUtils pageUtils = null; PageUtils pageUtils;
try { try {
Long userId = getUserId(); Long userId = getUserId();
pageUtils = assessService.userTaskList(req, userId); pageUtils = assessService.userTaskList(req, userId);
} catch (Exception e) { } catch (Exception e) {
log.error("获取用户事项异常 userId:" ,e); log.error("获取用户事项异常 userId:" ,e);
return R.error(); return R.error(e.getMessage());
} }
return R.ok().put("data",pageUtils); return R.ok().put("data",pageUtils);
} }