学生提交申请信息V7.4

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentspersonmanage/AidingStudentsPersonManageController.java

@@ -60,20 +60,19 @@ public class AidingStudentsPersonManageController {
     }
 
     @GetMapping("/college-get-page")
-    @Operation(summary = "学院模糊查询获取学生申请名单分页")
+    @Operation(summary = "学院信息数据统计")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:college-get-page')")
-    public CommonResult<PageResult<AidingStudentPersonManageInfoRespVO>> getAidingStudentsPersonManageCollegePage(@Valid @RequestBody AidingStudentPersonManageInfoPageReqVO pageReqVO) {
-        return success(aidingStudentsPersonManageService.getAidingStudentsPersonManageCollegePage(pageReqVO));
+    public CommonResult<PageResult<AidingStudentPersonManageInfoRespVO>> getAidingStudentsPersonManageCollegeData(@Valid @RequestBody AidingStudentPersonManageInfoPageReqVO pageReqVO) {
+        return success(aidingStudentsPersonManageService.getAidingStudentsPersonManageCollegeData(pageReqVO));
     }
 
-
-    @GetMapping("/class-get-page")
+    /*@GetMapping("/class-get-page")
     @Operation(summary = "班级模糊查询获取学生申请名单分页")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:class-get-page')")
     public CommonResult<PageResult<AidingStudentPersonManageInfoRespVO>> getAidingStudentsPersonManagePage(@Valid @RequestBody AidingStudentPersonManageInfoPageReqVO pageReqVO) {
         PageResult<AidingStudentsPersonManageDO> pageResult = aidingStudentsPersonManageService.getAidingStudentsPersonManageClassPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, AidingStudentPersonManageInfoRespVO.class));
-    }
+    }*/
 
     @PutMapping("/all-sort")
     @Operation(summary = "定序")

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentspersonmanage/vo/AidingStudentPersonManageInfoRespVO.java

@@ -120,7 +120,7 @@ public class AidingStudentPersonManageInfoRespVO {
     // 表格
     // id
     // 学院名字
-    private String collgeName;
+    private String collegeName;
     // 年级
     // 专业
     // 班级

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/aidingstudentspersonmanage/AidingStudentPersonManageEvaluationResultDO.java

@@ -37,6 +37,4 @@ public class AidingStudentPersonManageEvaluationResultDO extends BaseDO {
     private Integer collegeManageId;
     // 项目ID
     private Integer manageId;
-    private String major;
-    private String grade;
 }

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/mysql/aidingstudentspersonmanage/AidingStudentsPersonManageMapper.java

@@ -20,16 +20,16 @@ import java.util.Map;
 @Mapper
 public interface AidingStudentsPersonManageMapper extends BaseMapperX<AidingStudentsPersonManageDO> {
 
-    default PageResult<AidingStudentsPersonManageDO> selectPage(AidingStudentPersonManageInfoPageReqVO reqVO) {
+    /*default PageResult<AidingStudentsPersonManageDO> selectPage(AidingStudentPersonManageInfoPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapper<AidingStudentsPersonManageDO>()
                 .eq(StringUtils.isNotBlank(reqVO.getClassName()),AidingStudentsPersonManageDO::getClassName, reqVO.getClassName())
-                .eq(reqVO.getCollegeManageId() != null,AidingStudentsPersonManageDO::getDifficultType, reqVO.getCollegeManageId())
+                .eq(reqVO.getCollegeManageId() != null,AidingStudentsPersonManageDO::getCollegeManageId, reqVO.getCollegeManageId())
                 .eq(reqVO.getManageId() != null,AidingStudentsPersonManageDO::getManageId, reqVO.getManageId())
                 .like(StringUtils.isNotBlank(reqVO.getNickname()),AidingStudentsPersonManageDO::getNickname, reqVO.getNickname())
                 .like(StringUtils.isNotBlank(reqVO.getStudentSno()),AidingStudentsPersonManageDO::getStudentSno, reqVO.getStudentSno())
                 .eq(reqVO.getDifficultType() != null,AidingStudentsPersonManageDO::getDifficultType, reqVO.getDifficultType())
-                .orderByDesc(AidingStudentsPersonManageDO::getId));
-    }
+                .orderByDesc(AidingStudentsPersonManageDO::getSort));
+    }*/
 
     /**
      * 根据学生ID查询data_info数据

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/aidingstudentspersonmanage/AidingStudentsPersonManageService.java

@@ -28,8 +28,8 @@ public interface AidingStudentsPersonManageService  {
      * 获取学生申请信息分页
      * @param pageReqVO
      * @return
-     */
-    PageResult<AidingStudentsPersonManageDO> getAidingStudentsPersonManageClassPage(AidingStudentPersonManageInfoPageReqVO pageReqVO);
+     *//*
+    PageResult<AidingStudentsPersonManageDO> getAidingStudentsPersonManageClassPage(AidingStudentPersonManageInfoPageReqVO pageReqVO);*/
 
 
     /**
@@ -50,11 +50,11 @@ public interface AidingStudentsPersonManageService  {
     void editAidingStudentsManage(AidingStudentPersonManageInfoRespVO uploadVO);
 
     /**
-     * 学院获取各个班级的分页信息
+     * 学院获取各个班级的信息统计
      * @param pageReqVO
      * @return
      */
-    PageResult<AidingStudentPersonManageInfoRespVO> getAidingStudentsPersonManageCollegePage(AidingStudentPersonManageInfoPageReqVO pageReqVO);
+    PageResult<AidingStudentPersonManageInfoRespVO> getAidingStudentsPersonManageCollegeData(AidingStudentPersonManageInfoPageReqVO pageReqVO);
 
     /**
      * 班级定序，集体

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/aidingstudentspersonmanage/AidingStudentsPersonManageServiceImpl.java

@@ -114,12 +114,12 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
     }
 
     /**
-     * 学院获取各个班级的分页信息
+     * 学院获取各个班级数据统计
      * @param pageReqVO
      * @return
      */
     @Override
-    public PageResult<AidingStudentPersonManageInfoRespVO> getAidingStudentsPersonManageCollegePage(
+    public PageResult<AidingStudentPersonManageInfoRespVO> getAidingStudentsPersonManageCollegeData(
             AidingStudentPersonManageInfoPageReqVO pageReqVO) {
         AidingStudentPersonManageInfoRespVO vo = new AidingStudentPersonManageInfoRespVO();
         List<AidingStudentPersonManageClassVO> list = new ArrayList<>();
@@ -203,21 +203,21 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
      * @param pageReqVO
      * @return
      */
-    @Override
+    /*@Override
     public PageResult<AidingStudentsPersonManageDO> getAidingStudentsPersonManageClassPage(
             AidingStudentPersonManageInfoPageReqVO pageReqVO) {
         return aidingStudentsPersonManageMapper.selectPage(pageReqVO);
-    }
+    }*/
 
     /**
-     * 定序与建议等级- 集体
+     * 定序与建议等级
      * @param ids
      */
     @Override
     public void allsortAidingStudentsManage(List<AidingStudentPersonManageSortReqVO> ids) {
         for (AidingStudentPersonManageSortReqVO id : ids) {
             LambdaUpdateWrapper<AidingStudentsPersonManageDO> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.eq(AidingStudentsPersonManageDO::getId, id)
+            updateWrapper.eq(AidingStudentsPersonManageDO::getId, id.getId())
                     .set(AidingStudentsPersonManageDO::getSort, id.getSort());
             if (id.getClassSuggestionDifficultType() != null)
                 updateWrapper.set(AidingStudentsPersonManageDO::getClassSuggestionDifficultType, id.getClassSuggestionDifficultType());
@@ -244,7 +244,7 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
 
 
     /**
-     * (学校)办公室老师获取学生分页信息
+     * 学生分页信息
      * @param pageReqVO
      * @return
      */
@@ -258,17 +258,19 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
                         .like(StringUtils.isNotBlank(pageReqVO.getCollegeName()), AidingStudentsPersonManageDO::getCollegeName, pageReqVO.getCollegeName())
                         .eq(pageReqVO.getManageId() != null ,AidingStudentsPersonManageDO::getManageId, pageReqVO.getManageId())
                         .eq(pageReqVO.getDifficultType() != null,AidingStudentsPersonManageDO::getDifficultType, pageReqVO.getDifficultType())
+                        .eq(pageReqVO.getCollegeManageId() != null,AidingStudentsPersonManageDO::getCollegeManageId, pageReqVO.getCollegeManageId())
                         .like(StringUtils.isNotBlank(pageReqVO.getMajor()), AidingStudentsPersonManageDO::getMajor, pageReqVO.getMajor())
                         .like(StringUtils.isNotBlank(pageReqVO.getGrade()), AidingStudentsPersonManageDO::getGrade, pageReqVO.getGrade())
                         .like(StringUtils.isNotBlank(pageReqVO.getClassName()), AidingStudentsPersonManageDO::getClassName, pageReqVO.getClassName())
                         .like(StringUtils.isNotBlank(pageReqVO.getNickname()), AidingStudentsPersonManageDO::getNickname, pageReqVO.getNickname())
                         .like(StringUtils.isNotBlank(pageReqVO.getStudentSno()), AidingStudentsPersonManageDO::getStudentSno, pageReqVO.getStudentSno())
+                        .orderByDesc(AidingStudentsPersonManageDO::getSort)
                 );
         return new PageResult<>(BeanUtils.toBean(allList, AidingStudentPersonManageInfoRespVO.class), (long) allList.size());
     }
 
     /**
-     * 获取各个学院的部分信息
+     * 学校-获取各个学院的数据
      * @param manageId
      * @return
      */

yudao-module-as/yudao-module-as-biz/src/main/resources/mapper/aidingStudentsPersonManage/AidingStudentsPersonManageMapper.xml

@@ -29,8 +29,8 @@
             <if test="grade != null and grade != ''">
                 and class_name like concat('%',#{grade},'%')
             </if>
-            <if test="clName != null and clName != ''">
-                and class_name like concat('%',#{clName},'%')
+            <if test="className != null and className != ''">
+                and class_name like concat('%',#{className},'%')
             </if>
         </where>
         GROUP BY class_name