diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java index 3196db14..929a95c8 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -45,8 +45,8 @@ public class AssessManagerController { @PostMapping("assess/manager/detail") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerDetailRes.class)}) public R assessDetail(@RequestBody AssessDetailReq req){ - assessManagerService.assessDetail(req); - return R.ok(); + PageUtils pageUtils = assessManagerService.assessDetail(req); + return R.ok().put("data",pageUtils); } diff --git a/src/main/java/com/lz/modules/performance/service/AssessManagerService.java b/src/main/java/com/lz/modules/performance/service/AssessManagerService.java index 3c018a92..f75bfbfc 100644 --- a/src/main/java/com/lz/modules/performance/service/AssessManagerService.java +++ b/src/main/java/com/lz/modules/performance/service/AssessManagerService.java @@ -15,5 +15,5 @@ public interface AssessManagerService { PageUtils assessList(AssessListReq req); - void assessDetail(AssessDetailReq req); + PageUtils assessDetail(AssessDetailReq req); } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index 1a739eb5..4e5eb8d0 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -72,17 +72,10 @@ public class AssessManagerServiceImpl implements AssessManagerService { } @Override - public void assessDetail(AssessDetailReq req) { + public PageUtils assessDetail(AssessDetailReq req) { PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect( page -> resultRecordMapper.selectAssessListByStartId(page,null) ); - - List list = pageUtils.getList(); - if(CollectionUtils.isEmpty(list)){ - return; - } - - List data = new ArrayList<>(); - + return pageUtils; } } diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 07b1779b..c66b9b39 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -1,6 +1,6 @@ - +