diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java index 13d0d948..92023f49 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java @@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluationCollect; import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationCollectService; import org.springframework.beans.factory.annotation.Autowired; @@ -55,6 +57,31 @@ public class PersonalAbilityEvaluationCollectController extends JeecgController< return Result.OK(pageList); } + + /** + * 分页列表查询(学生端) + * + * @param personalAbilityEvaluationCollect + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "个人能力评价 汇总-分页列表查询") + @ApiOperation(value = "个人能力评价 汇总-分页列表查询", notes = "个人能力评价 汇总-分页列表查询") + @GetMapping(value = "/liststu") + public Result> liststu(PersonalAbilityEvaluationCollect personalAbilityEvaluationCollect, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(personalAbilityEvaluationCollect, req.getParameterMap()); + LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal(); + queryWrapper.eq("work_on",user.getUsername()); + Page page = new Page(pageNo, pageSize); + IPage pageList = personalAbilityEvaluationCollectService.page(page, queryWrapper); + return Result.OK(pageList); + } + /** * 添加 * diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationController.java index 59474380..7c8b6905 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationController.java @@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluation; import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationService; import org.springframework.beans.factory.annotation.Autowired; @@ -55,6 +57,30 @@ public class PersonalAbilityEvaluationController extends JeecgController> liststu(PersonalAbilityEvaluation personalAbilityEvaluation, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(personalAbilityEvaluation, req.getParameterMap()); + LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal(); + queryWrapper.eq("work_on",user.getUsername()); + Page page = new Page(pageNo, pageSize); + IPage pageList = personalAbilityEvaluationService.page(page, queryWrapper); + return Result.OK(pageList); + } + /** * 添加 * diff --git a/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScoreList.vue b/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScoreList.vue index ced3a244..e1c7cdd7 100644 --- a/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScoreList.vue +++ b/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScoreList.vue @@ -159,10 +159,10 @@ import {ref, computed, unref, reactive} from 'vue'; // label: '编辑', // onClick: handleEdit.bind(null, record), // }, - { +/* { label: '详情', onClick: handleDetail.bind(null, record), - } + }*/ ] } /** diff --git a/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScoreList.vue b/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScoreList.vue index 5eb2a84f..9fdb59d4 100644 --- a/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScoreList.vue +++ b/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScoreList.vue @@ -163,10 +163,10 @@ function getTableAction(record) { // label: '编辑', // onClick: handleEdit.bind(null, record), // } - { +/* { label: '详情', onClick: handleDetail.bind(null, record), - } + }*/ ] }