diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java index 202c8383..e86cc3c0 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java @@ -787,13 +787,25 @@ public class TAbilityApplicationController { @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"), @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"), @ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "ended", value = "是否完成(true, false)", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "resourceId", value = "资源id", paramType = "query", dataType = "String") + @ApiImplicitParam(name = "oneEnded", value = "是否完成(true, false)", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "score", value = "是否已评分(true, false)", paramType = "query", dataType = "String") } ) - public Result> pageForScore(@ApiIgnore @RequestParam Map params) { + public Result>> pageForScore(@ApiIgnore @RequestParam Map params) { + final UserDetail user = SecurityUser.getUser(); + params.put("user_id", user == null ? null : user.getId()); PageData page = tAbilityApplicationService.page(params); - return new Result>().ok(page); + List> mapList = page.getList().stream().map(index -> { + Map temp = new LinkedHashMap<>(); + temp.put("applyNumber", index.getApplyNumber()); + temp.put("approveStatus", index.getApproveStatus()); + temp.put("createDate", index.getCreateDate()); + temp.put("system", index.getSystem()); + temp.put("resourceId", index.getResourceId()); + return temp; + }).collect(Collectors.toList()); + PageData> pageData = new PageData<>(mapList, page.getTotal()); + return new Result>>().ok(pageData); } } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java index 47059aa4..18f9e5f7 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java @@ -56,7 +56,7 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl