学生提交申请信息V3.0

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

@@ -3,16 +3,11 @@ package cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.as.controller.admin.aidingstudentscollegemanage.vo.AidingStudentsCollegeManagePageReqVO;
-import cn.iocoder.yudao.module.as.controller.admin.aidingstudentscollegemanage.vo.AidingStudentsCollegeManageRespVO;
-import cn.iocoder.yudao.module.as.controller.admin.aidingstudentsmanage.vo.AidingStudentsManageSaveReqVO;
 import cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.*;
-import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentscollegemanage.AidingStudentsCollegeManageDO;
 import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentspersonmanage.AidingStudentsPersonManageDO;
 import cn.iocoder.yudao.module.as.service.aidingstudentspersonmanage.AidingStudentsPersonManageService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -41,14 +36,14 @@ public class AidingStudentsPersonManageController {
     @GetMapping("/before-upload")
     @Operation(summary = "回显学生上传材料")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:before-upload')")
-    public CommonResult<AidingStudentsPersonManageUploadVO> beforeuploadAidingStudentsPersonManage() {
+    public CommonResult<AidingStudentsPersonManageUploadRespVO> beforeuploadAidingStudentsPersonManage() {
         return success(aidingStudentsPersonManageService.beforeuploadAidingStudentsManage());
     }
 
     @PostMapping("/upload")
     @Operation(summary = "学生上传材料")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:upload')")
-    public CommonResult<Boolean> uploadAidingStudentsPersonManage(@Valid @RequestBody AidingStudentsPersonManageUploadVO uploadVO) {
+    public CommonResult<Boolean> uploadAidingStudentsPersonManage(@Valid @RequestBody AidingStudentsPersonManageUploadRespVO uploadVO) {
         aidingStudentsPersonManageService.uploadAidingStudentsManage(uploadVO);
         return success(true);
     }
@@ -56,38 +51,38 @@ public class AidingStudentsPersonManageController {
     @GetMapping("/check")
     @Operation(summary = "学生查看申请信息")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:check')")
-    public CommonResult<AidingStudentsPersonManageUploadVO> checkAidingStudentsPersonManage() {
+    public CommonResult<AidingStudentsPersonManageUploadRespVO> checkAidingStudentsPersonManage() {
         return success(aidingStudentsPersonManageService.checkAidingStudentsManage());
     }
 
     @PutMapping("/edit")
     @Operation(summary = "学生修改申请信息")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:edit')")
-    public CommonResult<Boolean> editAidingStudentsPersonManage(@Valid @RequestBody AidingStudentsPersonManageUploadVO uploadVO) {
+    public CommonResult<Boolean> editAidingStudentsPersonManage(@Valid @RequestBody AidingStudentsPersonManageUploadRespVO uploadVO) {
         aidingStudentsPersonManageService.editAidingStudentsManage(uploadVO);
         return success(true);
     }
 
-    @GetMapping("/college-page")
-    @Operation(summary = "获得学生家庭困难认定项目 学院 - 分页")
-    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:college-page')")
+    @GetMapping("/college-get-page")
+    @Operation(summary = "学院模糊查询获取学生申请名单分页")
+    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:college-get-page')")
     public CommonResult<PageResult<AidingStudentPersonManageCollegeRespVO>> getAidingStudentsPersonManageCollegePage(@Valid @RequestBody AidingStudentPersonManagerCollegePageReqVO pageReqVO) {
         return success(aidingStudentsPersonManageService.getAidingStudentsPersonManageCollegePage(pageReqVO));
     }
 
 
-    @GetMapping("/student-page")
-    @Operation(summary = "获得学生家庭困难认定项目 学生 - 分页")
-    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:student-page')")
-    public CommonResult<PageResult<AidingStudentsPersonManageRespVO>> getAidingStudentsPersonManagePage(@Valid @RequestBody AidingStudentsPersonManagePageReqVO pageReqVO) {
-        PageResult<AidingStudentsPersonManageDO> pageResult = aidingStudentsPersonManageService.getAidingStudentsPersonManagePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, AidingStudentsPersonManageRespVO.class));
+    @GetMapping("/class-get-page")
+    @Operation(summary = "班级模糊查询获取学生申请名单分页")
+    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:class-get-page')")
+    public CommonResult<PageResult<AidingStudentsPersonManageClassRespVO>> getAidingStudentsPersonManagePage(@Valid @RequestBody AidingStudentsPersonManageClassPageReqVO pageReqVO) {
+        PageResult<AidingStudentsPersonManageDO> pageResult = aidingStudentsPersonManageService.getAidingStudentsPersonManageClassPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, AidingStudentsPersonManageClassRespVO.class));
     }
 
     @PutMapping("/all-sort")
     @Operation(summary = "班级定序 - 集体")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:all-sort')")
-    public CommonResult<Boolean> allsortAidingStudentsPersonManage(@Valid @RequestBody List<AidingStudentPersonManageSortVO> ids){
+    public CommonResult<Boolean> allsortAidingStudentsPersonManage(@Valid @RequestBody List<AidingStudentPersonManageSortReqVO> ids){
         aidingStudentsPersonManageService.allsortAidingStudentsManage(ids);
         return success(true);
     }
@@ -105,30 +100,28 @@ public class AidingStudentsPersonManageController {
     @PostMapping("/upload-result")
     @Operation(summary = "班主任上传线下讨论结果照片")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:upload-result')")
-    public CommonResult<Boolean> uploadResultAidingStudentsPersonManage(@Valid @RequestBody AidingStudentPersonManageClassResultVO classuploadVO) {
+    public CommonResult<Boolean> uploadResultAidingStudentsPersonManage(@Valid @RequestBody AidingStudentPersonManageClassResultReqVO classuploadVO) {
         aidingStudentsPersonManageService.uploadResultAidingStudentsManage(classuploadVO);
         return success(true);
     }
 
-    @PutMapping("/pass-reject")
-    @Operation(summary = "审核 ： 通过/驳回 ")
-    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:pass-reject')")
-    public CommonResult<Boolean> sortAidingStudentsPersonManage(@RequestParam("id") Long id,
-                                                                @RequestParam("status") Integer status,
-                                                                @RequestParam("rejectNotes") String rejectNotes){
-        aidingStudentsPersonManageService.passOrrejectAidingStudentsManage(id,status, rejectNotes);
-        return success(true);
+    @GetMapping("/school-get-page")
+    @Operation(summary = "学校模糊查询获取学生申请名单分页")
+    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:school-get-page')")
+    public CommonResult<PageResult<AidingStudentPersonManageSchoolRespVO>> teachergetAidingStudentsPersonManagePage(@Valid @RequestBody AidingStudentPersonManageSchoolPageReqVO pageReqVO) {
+        return success(aidingStudentsPersonManageService.schoolgetAidingStudentsPersonManagePage(pageReqVO));
     }
 
-    @GetMapping("/teacher-getstudentinfo")
-    @Operation(summary = "获得学生家庭困难认定项目 学校获取学生 - 分页")
-    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:teacher-getstudentinfo')")
-    public CommonResult<PageResult<AidingStudentPersonManageTeacherRespVO>> teachergetAidingStudentsPersonManagePage(@Valid @RequestBody AidingStudentPersonManageTeacherPageReqVO pageReqVO) {
-        return success(aidingStudentsPersonManageService.teachergetAidingStudentsPersonManagePage(pageReqVO));
+    @GetMapping("/school-get-student-info-part")
+    @Operation(summary = "学校获取统计数据（部分）")
+    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:school-get-student-info-part')")
+    public CommonResult<AidingStudentPersonManageDataPartRespVO> tteachergetAidingStudentsPersonManageData(@Valid @RequestParam("manageId")Integer manageId) {
+        return success(aidingStudentsPersonManageService.schoolgetAidingStudentsPersonManageData(manageId));
     }
 
 
 
 
 
+
 }

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

@@ -12,7 +12,9 @@ import lombok.Data;
 @Schema(description = "管理后台 - 家庭困难认定项目管理 班级Resp VO")
 @Data
 @ExcelIgnoreUnannotated
-public class AidingStudentPersonManageClassResultVO {
+public class AidingStudentPersonManageClassResultReqVO {
+    private String major;
+    private String grade;
     // 班级
     private String className;
     // 班主任名字（负责人）
@@ -20,7 +22,7 @@ public class AidingStudentPersonManageClassResultVO {
     // 照片
     private String image;
     // 学院id
-    private Integer collegeId;
+    private Integer collegeManageId;
     // 项目ID
     private Integer manageId;
 }

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

@@ -13,6 +13,8 @@ import lombok.Data;
 @Data
 @ExcelIgnoreUnannotated
 public class AidingStudentPersonManageClassVO {
+    private String major;
+    private String grade;
     // 班级名称
     private String className;
 

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

@@ -15,6 +15,8 @@ import java.util.List;
 @Data
 @ExcelIgnoreUnannotated
 public class AidingStudentPersonManageCollegeRespVO {
+    private String major;
+    private String grade;
     // 学院申请人数
     private Integer collegeAll;
 

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

@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @autor WoVoM
+ * @data 2024/7/11 14:22
+ * @@version 1.0
+ */
+@Schema(description = "管理后台 - 家庭困难认定项目管理 班级Resp VO")
+@Data
+@ExcelIgnoreUnannotated
+public class AidingStudentPersonManageDataPartRespVO {
+    private String major;
+    private String grade;
+    // 提交人数
+    private Integer allsubmit;
+    // 审批完成人数
+    private Integer completedNumber;
+    // 各个学院申请人数\通过人数
+    private List<Map<String, Object>> collegeNumber;
+}

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

@@ -15,12 +15,11 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class AidingStudentPersonManageTeacherPageReqVO extends PageParam {
+public class AidingStudentPersonManageSchoolPageReqVO extends PageParam {
     // 学院
-    private Integer collegeId;
+    private Integer collegeManageId;
     // 项目ID
     private Integer manageId;
-    //计算机类2023-1班
     // 年级
     private String grade;
     // 班级
@@ -31,5 +30,7 @@ public class AidingStudentPersonManageTeacherPageReqVO extends PageParam {
     private String name;
     // 申请类型
     private Integer difficultType;
+    // 专业
+    private String major;;
 
 }

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

@@ -16,22 +16,14 @@ import java.util.Map;
 @Schema(description = "管理后台 - 家庭困难认定项目管理 班级Resp VO")
 @Data
 @ExcelIgnoreUnannotated
-public class AidingStudentPersonManageTeacherRespVO {
-    // 提交人数
-    private Integer allsubmit;
-    // 审批完成人数
-    private Integer completedNumber;
-    // 各个学院申请人数
-    private List<Map<String, Integer>> collegeNumber;
-    // 审批通过人数
-    private Integer pass;
+public class AidingStudentPersonManageSchoolRespVO {
     /**
      * 表格需要数据
      */
     // id
     private Integer id;
-    // 学院
-    private Integer collegeId;
+    // 学院 项目管理ID
+    private Integer collegeManageId;
     //计算机类2023-1班
     // 年级
     private String grade;

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

@@ -13,11 +13,13 @@ import lombok.ToString;
 @Schema(description = "管理后台 - 家庭困难认定项目管理分页 -  Request VO")
 @Data
 @ToString(callSuper = true)
-public class AidingStudentPersonManageSortVO {
+public class AidingStudentPersonManageSortReqVO {
     // 学生ID（主键）
     private Integer id;
     // 排序
     private Integer sort;
     // 困难类型
     private Integer difficultType;
+    private String major;
+    private String grade;
 }

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

@@ -19,8 +19,8 @@ import java.util.List;
 @ToString(callSuper = true)
 public class AidingStudentPersonManagerCollegePageReqVO extends PageParam {
 
-    // 学院Id
-    private Integer collegeId;
+    // 学院项目Id
+    private Integer collegeManageId;
 
     // 项目ID
     private Integer manageId;
@@ -34,4 +34,5 @@ public class AidingStudentPersonManagerCollegePageReqVO extends PageParam {
     // 班级
     private String clName;
 
+
 }

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

@@ -17,11 +17,11 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class AidingStudentsPersonManagePageReqVO extends PageParam {
+public class AidingStudentsPersonManageClassPageReqVO extends PageParam {
     // 班级名称
     private String className;
     // 学院Id
-    private Integer collegeId;
+    private Integer collegeManageId;
     // 项目ID
     private Integer manageId;
     //姓名
@@ -32,4 +32,6 @@ public class AidingStudentsPersonManagePageReqVO extends PageParam {
     private String studentSno;
     // 状态
     private Integer status;
+    private String major;
+    private String grade;
 }

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

@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
 @Schema(description = "管理后台 - 家庭困难认定项目管理 Resp VO")
 @Data
 @ExcelIgnoreUnannotated
-public class AidingStudentsPersonManageRespVO {
+public class AidingStudentsPersonManageClassRespVO {
     private Integer id;
     //姓名
     private String nickname;
@@ -27,7 +27,7 @@ public class AidingStudentsPersonManageRespVO {
     // 排序
     private Integer sort;
     // 学院id
-    private Integer collegeId;
+    private Integer collegeManageId;
     // 项目ID
     private Integer manageId;
     // 班级 ：计算机类2023-1班
@@ -44,4 +44,8 @@ public class AidingStudentsPersonManageRespVO {
     private String registeredResidence;
     // 状态
     private Integer status;
+    // 专业名称
+    private String major;
+    // 年级
+    private String grade;
 }

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

@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
 @Schema(description = "管理后台 - 家庭困难认定项目管理 Upload VO")
 @Data
 @ExcelIgnoreUnannotated
-public class AidingStudentsPersonManageUploadVO {
+public class AidingStudentsPersonManageUploadRespVO {
     // id
     private Integer id;
     //姓名
@@ -27,8 +27,8 @@ public class AidingStudentsPersonManageUploadVO {
     private String evidence;
     // 排序
     private Integer sort;
-    // 学院id
-    private Integer collegeId;
+    // 学院项目id
+    private Integer collegeManageId;
     // 项目ID
     private Integer manageId;
     // 班级
@@ -45,4 +45,6 @@ public class AidingStudentsPersonManageUploadVO {
     private String registeredResidence;
     // 状态
     private Integer status;
+    private String major;
+    private String grade;
 }

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

@@ -32,8 +32,10 @@ public class AidingStudentPersonManageEvaluationResultDO extends BaseDO {
     private String image;
     // 状态（1已经评价，0未评价）
     private Integer status;
-    // 学院id
-    private Integer collegeId;
+    // 学院项目管理id
+    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/dataobject/aidingstudentspersonmanage/AidingStudentsPersonManageDO.java

@@ -39,6 +39,8 @@ public class AidingStudentsPersonManageDO extends BaseDO {
     private Integer collegeId;
     // 项目ID
     private Integer manageId;
+    // 学院项目主键ID
+    private Integer collegeManageId;
     // 班级 ：计算机类2023-1班
     private String className;
     // 备注
@@ -55,4 +57,10 @@ public class AidingStudentsPersonManageDO extends BaseDO {
     private Integer status;
     // 驳回批注
     private String rejectNotes;
+    // 专业
+    private String major;
+    // 年级
+    private String grade;
+    // 所在院系名称
+    private String collegeName;
 }

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

@@ -2,12 +2,8 @@ package cn.iocoder.yudao.module.as.dal.mysql.aidingstudentspersonmanage;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.as.controller.admin.aidingstudentsmanage.vo.AidingStudentsManagePageReqVO;
 import cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentPersonManagerCollegePageReqVO;
-import cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentsPersonManagePageReqVO;
-import cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentsPersonManageRespVO;
-import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentsmanage.AidingStudentsManageDO;
+import cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentsPersonManageClassPageReqVO;
 import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentspersonmanage.AidingStudentsPersonManageDO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang3.StringUtils;
@@ -25,10 +21,10 @@ import java.util.Map;
 @Mapper
 public interface AidingStudentsPersonManageMapper extends BaseMapperX<AidingStudentsPersonManageDO> {
 
-    default PageResult<AidingStudentsPersonManageDO> selectPage(AidingStudentsPersonManagePageReqVO reqVO) {
+    default PageResult<AidingStudentsPersonManageDO> selectPage(AidingStudentsPersonManageClassPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapper<AidingStudentsPersonManageDO>()
                 .eq(StringUtils.isNotBlank(reqVO.getClassName()),AidingStudentsPersonManageDO::getDifficultType, reqVO.getClassName())
-                .eq(reqVO.getCollegeId() != null,AidingStudentsPersonManageDO::getDifficultType, reqVO.getCollegeId())
+                .eq(reqVO.getCollegeManageId() != null,AidingStudentsPersonManageDO::getDifficultType, reqVO.getCollegeManageId())
                 .eq(reqVO.getManageId() != null,AidingStudentsPersonManageDO::getDifficultType, reqVO.getManageId())
                 .like(StringUtils.isNotBlank(reqVO.getNickname()),AidingStudentsPersonManageDO::getNickname, reqVO.getNickname())
                 .like(StringUtils.isNotBlank(reqVO.getStudentSno()),AidingStudentsPersonManageDO::getStudentSno, reqVO.getStudentSno())
@@ -51,4 +47,11 @@ public interface AidingStudentsPersonManageMapper extends BaseMapperX<AidingStud
     List<Map<String, Object>> countByClassName(AidingStudentPersonManagerCollegePageReqVO pageReqVO);
 
 
+    /**
+     *
+     * @param szzym
+     */
+
+    @Select("select ZYMC from data_professional_info where ZYM = #{szzym}")
+    Map getMajorById(Object szzym);
 }

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

@@ -16,20 +16,20 @@ public interface AidingStudentsPersonManageService  {
      *
      * @return
      */
-    AidingStudentsPersonManageUploadVO beforeuploadAidingStudentsManage();
+    AidingStudentsPersonManageUploadRespVO beforeuploadAidingStudentsManage();
     /**
      * 学生上传材料
      * @param uploadVO
      * @return
      */
-    void uploadAidingStudentsManage(AidingStudentsPersonManageUploadVO uploadVO);
+    void uploadAidingStudentsManage(AidingStudentsPersonManageUploadRespVO uploadVO);
 
     /**
      * 获取学生申请信息分页
      * @param pageReqVO
      * @return
      */
-    PageResult<AidingStudentsPersonManageDO> getAidingStudentsPersonManagePage(AidingStudentsPersonManagePageReqVO pageReqVO);
+    PageResult<AidingStudentsPersonManageDO> getAidingStudentsPersonManageClassPage(AidingStudentsPersonManageClassPageReqVO pageReqVO);
 
 
     /**
@@ -43,18 +43,18 @@ public interface AidingStudentsPersonManageService  {
      * 班主任上传线下讨论结果信息
      * @param classuploadVO
      */
-    void uploadResultAidingStudentsManage(AidingStudentPersonManageClassResultVO classuploadVO);
+    void uploadResultAidingStudentsManage(AidingStudentPersonManageClassResultReqVO classuploadVO);
 
     /**
      * 学生查看申请信息
      */
-    AidingStudentsPersonManageUploadVO checkAidingStudentsManage();
+    AidingStudentsPersonManageUploadRespVO checkAidingStudentsManage();
 
     /**
      * 学生修改申请信息
      * @param uploadVO
      */
-    void editAidingStudentsManage(AidingStudentsPersonManageUploadVO uploadVO);
+    void editAidingStudentsManage(AidingStudentsPersonManageUploadRespVO uploadVO);
 
     /**
      * 学院获取各个班级的分页信息
@@ -67,14 +67,7 @@ public interface AidingStudentsPersonManageService  {
      * 班级定序，集体
      * @param ids
      */
-    void allsortAidingStudentsManage(List<AidingStudentPersonManageSortVO> ids);
-
-    /**
-     * 学院资助助理驳回
-     * @param id
-     * @param rejectNotes
-     */
-    void passOrrejectAidingStudentsManage(Long id,Integer status, String rejectNotes);
+    void allsortAidingStudentsManage(List<AidingStudentPersonManageSortReqVO> ids);
 
 
     /**
@@ -82,5 +75,12 @@ public interface AidingStudentsPersonManageService  {
      * @param pageReqVO
      * @return
      */
-    PageResult<AidingStudentPersonManageTeacherRespVO> teachergetAidingStudentsPersonManagePage(AidingStudentPersonManageTeacherPageReqVO pageReqVO);
+    PageResult<AidingStudentPersonManageSchoolRespVO> schoolgetAidingStudentsPersonManagePage(AidingStudentPersonManageSchoolPageReqVO pageReqVO);
+
+    /**
+     * 获取各个学院的部分信息
+     * @param manageId
+     * @return
+     */
+    AidingStudentPersonManageDataPartRespVO schoolgetAidingStudentsPersonManageData(Integer manageId);
 }

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

@@ -1,25 +1,21 @@
 package cn.iocoder.yudao.module.as.service.aidingstudentspersonmanage;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
-import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.*;
-import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentsmanage.AidingStudentsManageDO;
 import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentspersonmanage.AidingStudentPersonManageEvaluationResultDO;
 import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentspersonmanage.AidingStudentsPersonManageDO;
 import cn.iocoder.yudao.module.as.dal.mysql.aidingstudentspersonmanage.AidingStudentPersonManageEvaluationResultMapper;
 import cn.iocoder.yudao.module.as.dal.mysql.aidingstudentspersonmanage.AidingStudentsPersonManageMapper;
-import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
-import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper;
-import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -45,34 +41,32 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
     private AidingStudentPersonManageEvaluationResultMapper aidingStudentPersonManageEvaluationResultMapper;
 
     @Autowired
-    private AdminUserMapper admiUSerMapper;
+    private DeptApi deptApi;
 
     @Autowired
-    private DeptMapper deptMapper;
+    private AdminUserApi adminUserApi;
 
     /**
      * 学生上传材料之前的信息回显
      * @return
      */
     @Override
-    public AidingStudentsPersonManageUploadVO beforeuploadAidingStudentsManage() {
+    public AidingStudentsPersonManageUploadRespVO beforeuploadAidingStudentsManage() {
         try {
-            LoginUser loginUser = getLoginUser();
-            AidingStudentsPersonManageUploadVO result = new AidingStudentsPersonManageUploadVO();
+            AdminUserRespDTO user = adminUserApi.getUser(getLoginUser().getId());
+            AidingStudentsPersonManageUploadRespVO result = new AidingStudentsPersonManageUploadRespVO();
             // 获取当前登录的用户表
-            AdminUserDO one = admiUSerMapper.selectOne(new QueryWrapper<AdminUserDO>()
-                    .eq("id", loginUser.getId()));
-            Map map = aidingStudentsPersonManageMapper.getByStudentId(one.getStudentId());
+            Map map = aidingStudentsPersonManageMapper.getByStudentId(user.getStudentId());
             log.info("map = {}" , map);
-            // 部门名称
+            // *班级名称
             result.setClassName((String) map.get("SZBJMC"));
-            // 学号
-            result.setStudentSno(one.getStudentId());
-            // 入学年份
+            // *学号
+            result.setStudentSno(user.getStudentId());
+            // *入学年份
             result.setEnrollmentYear((String) map.get("RXNY"));
-            // 身份证
+            // *身份证
             result.setIdCard((String) map.get("SFZJH"));
-            // 户籍
+            // *户籍
             result.setRegisteredResidence((String) map.get("JG"));
             return result;
         } catch (Exception exception) {
@@ -87,15 +81,29 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
      * @return
      */
     @Override
-    public void uploadAidingStudentsManage(AidingStudentsPersonManageUploadVO uploadVO) {
+    public void uploadAidingStudentsManage(AidingStudentsPersonManageUploadRespVO uploadVO) {
+        // 1.获取当前登录的用户表
         AidingStudentsPersonManageDO aDo = BeanUtils.toBean(uploadVO, AidingStudentsPersonManageDO.class);
-        LoginUser loginUser = getLoginUser();
-        // 获取当前登录的用户表
-        AdminUserDO one = admiUSerMapper.selectOne(new QueryWrapper<AdminUserDO>()
-                .eq("id", loginUser.getId()));
-        Map map = aidingStudentsPersonManageMapper.getByStudentId(one.getStudentId());
-        log.info("map = {}" , map);
-        aDo.setNickname(String.valueOf(map.get("XM")));
+        AdminUserRespDTO user =  adminUserApi.getUser(getLoginUser().getId());
+        Map map = aidingStudentsPersonManageMapper.getByStudentId(user.getStudentId());
+        // 2.补充字段
+        // 项目ID跟学院项目ID前端传
+
+        // 学院ID
+        Long collegeId = deptApi.getCollegeId(user.getDeptId());
+        aDo.setCollegeId(Math.toIntExact(collegeId));
+        // 学院名称
+        DeptRespDTO dept = deptApi.getDept(user.getDeptId());
+        aDo.setCollegeName(dept.getName());
+        // 专业名称
+        Map szzym = aidingStudentsPersonManageMapper.getMajorById(map.get("SZZYM"));
+        log.info("szzym = {}", szzym);
+        aDo.setMajor((String) szzym.get("ZYMC"));
+        // 年级
+        aDo.setGrade((String) map.get("SZNJ"));
+        // 姓名
+        aDo.setNickname(user.getNickname());
+        // 状态
         aDo.setStatus(0);
         aidingStudentsPersonManageMapper.insert(aDo);
     }
@@ -104,16 +112,10 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
      * 学生查看自己的申请信息
      */
     @Override
-    public AidingStudentsPersonManageUploadVO checkAidingStudentsManage() {
-        LoginUser loginUser = getLoginUser();
-        // 获取当前登录的用户表
-        AdminUserDO one = admiUSerMapper.selectOne(new QueryWrapper<AdminUserDO>()
-                .eq("id", loginUser.getId()));
-        String studentId = one.getStudentId();
-        AidingStudentsPersonManageDO me = this.getById(studentId);
-        AidingStudentsPersonManageUploadVO result = BeanUtils
-                .toBean(me, AidingStudentsPersonManageUploadVO.class);
-        return result;
+    public AidingStudentsPersonManageUploadRespVO checkAidingStudentsManage() {
+        AdminUserRespDTO user =  adminUserApi.getUser(getLoginUser().getId());
+        AidingStudentsPersonManageDO me = this.getById(user.getStudentId());
+        return BeanUtils.toBean(me, AidingStudentsPersonManageUploadRespVO.class);
     }
 
     /**
@@ -121,7 +123,7 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
      * @param uploadVO
      */
     @Override
-    public void editAidingStudentsManage(AidingStudentsPersonManageUploadVO uploadVO) {
+    public void editAidingStudentsManage(AidingStudentsPersonManageUploadRespVO uploadVO) {
         AidingStudentsPersonManageDO aDo = new AidingStudentsPersonManageDO();
          aDo = BeanUtils.toBean(uploadVO, AidingStudentsPersonManageDO.class);
          log.info("aDo 信息如下{}" , aDo);
@@ -140,12 +142,12 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
         AidingStudentPersonManageCollegeRespVO vo = new AidingStudentPersonManageCollegeRespVO();
         List<AidingStudentPersonManageClassVO> list = new ArrayList<>();
         List<AidingStudentsPersonManageDO> allList = aidingStudentsPersonManageMapper
-                .selectList(new QueryWrapper<AidingStudentsPersonManageDO>()
-                        .eq("college_id", pageReqVO.getCollegeId())
-                        .eq("manage_id", pageReqVO.getManageId())
-                        .like(StringUtils.isNotBlank(pageReqVO.getMajor()), "class_name", pageReqVO.getMajor())
-                        .like(StringUtils.isNotBlank(pageReqVO.getGrade()), "class_name", pageReqVO.getGrade())
-                        .like(StringUtils.isNotBlank(pageReqVO.getClName()), "class_name", pageReqVO.getClName()));
+                .selectList(new LambdaQueryWrapper<AidingStudentsPersonManageDO>()
+                        .eq(AidingStudentsPersonManageDO::getCollegeManageId, pageReqVO.getCollegeManageId())
+                        .eq(AidingStudentsPersonManageDO::getManageId, pageReqVO.getManageId())
+                        .like(StringUtils.isNotBlank(pageReqVO.getMajor()), AidingStudentsPersonManageDO::getMajor, pageReqVO.getMajor())
+                        .like(StringUtils.isNotBlank(pageReqVO.getGrade()), AidingStudentsPersonManageDO::getGrade, pageReqVO.getGrade())
+                        .like(StringUtils.isNotBlank(pageReqVO.getClName()), AidingStudentsPersonManageDO::getClassName, pageReqVO.getClName()));
         int wait = 0, edit = 0, pass = 0;
         for (int i = 0; i < allList.size(); i++) {
             AidingStudentsPersonManageDO aDo = allList.get(i);
@@ -172,10 +174,10 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
             log.info("遍历Map{}", map);
             AidingStudentPersonManageClassVO classVo = new AidingStudentPersonManageClassVO();
             List<AidingStudentsPersonManageDO> classList = aidingStudentsPersonManageMapper
-                    .selectList(new QueryWrapper<AidingStudentsPersonManageDO>()
-                            .eq("college_id", pageReqVO.getCollegeId())
-                            .eq("manage_id", pageReqVO.getManageId())
-                            .eq("class_name", map.get("class_name")));
+                    .selectList(new LambdaQueryWrapper<AidingStudentsPersonManageDO>()
+                            .eq(AidingStudentsPersonManageDO::getCollegeManageId, pageReqVO.getCollegeManageId())
+                            .eq(AidingStudentsPersonManageDO::getManageId, pageReqVO.getManageId())
+                            .eq(AidingStudentsPersonManageDO::getClassName, map.get("class_name")));
             log.info("classList = {}", classList);
             wait = 0;
             edit = 0;
@@ -211,29 +213,29 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
     }
 
     /**
-     * 获取学生申请信息分页 (班级)
+     * 班级获取学生申请信息分页
      * @param pageReqVO
      * @return
      */
     @Override
-    public PageResult<AidingStudentsPersonManageDO> getAidingStudentsPersonManagePage(
-            AidingStudentsPersonManagePageReqVO pageReqVO) {
+    public PageResult<AidingStudentsPersonManageDO> getAidingStudentsPersonManageClassPage(
+            AidingStudentsPersonManageClassPageReqVO pageReqVO) {
         return aidingStudentsPersonManageMapper.selectPage(pageReqVO);
     }
 
     /**
-     * 班级定序，集体
+     * 班级定序 - 集体
      * @param ids
      */
     @Override
-    public void allsortAidingStudentsManage(List<AidingStudentPersonManageSortVO> ids) {
-        for (AidingStudentPersonManageSortVO id : ids) {
+    public void allsortAidingStudentsManage(List<AidingStudentPersonManageSortReqVO> ids) {
+        for (AidingStudentPersonManageSortReqVO id : ids) {
             sortAidingStudentsManage(Long.valueOf(id.getId()), id.getSort(), id.getDifficultType());
         }
     }
 
     /**
-     * 班级定序 - 一个人
+     * 班级定序 - 个人
      * @param id
      * @param sort
      */
@@ -253,75 +255,76 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
      * @param classuploadVO
      */
     @Override
-    public void uploadResultAidingStudentsManage(AidingStudentPersonManageClassResultVO classuploadVO) {
+    public void uploadResultAidingStudentsManage(AidingStudentPersonManageClassResultReqVO classuploadVO) {
         AidingStudentPersonManageEvaluationResultDO ado = new AidingStudentPersonManageEvaluationResultDO();
         org.springframework.beans.BeanUtils.copyProperties(classuploadVO,ado);
         ado.setStatus(1);
         aidingStudentPersonManageEvaluationResultMapper.insert(ado);
     }
 
-    /**
-     * 学院资助助理驳回
-     * @param id
-     * @param rejectNotes
-     */
-    @Override
-    public void passOrrejectAidingStudentsManage(Long id, Integer status,String rejectNotes) {
-        AidingStudentsPersonManageDO aDo = aidingStudentsPersonManageMapper.selectOne(
-                new QueryWrapper<AidingStudentsPersonManageDO>()
-                        .eq("id", id));
-        aDo.setStatus(status);
-        if(rejectNotes != ""){
-            aDo.setNotes(rejectNotes);
-        }
-        aidingStudentsPersonManageMapper.updateById(aDo);
-    }
 
     /**
-     * 办公室老师获取学生分页信息
+     * (学校)办公室老师获取学生分页信息
      * @param pageReqVO
      * @return
      */
     @Override
-    public PageResult<AidingStudentPersonManageTeacherRespVO> teachergetAidingStudentsPersonManagePage(AidingStudentPersonManageTeacherPageReqVO pageReqVO) {
-        /**
-         * 数据
-         */
-        // TODO 不知道不是不是两个独立开的，因为如果不独立，搜索的时候，提交人数啥的可能会变
+    public PageResult<AidingStudentPersonManageSchoolRespVO> schoolgetAidingStudentsPersonManagePage(AidingStudentPersonManageSchoolPageReqVO pageReqVO) {
         /**
          * 表格信息
          */
         List<AidingStudentsPersonManageDO> allList = aidingStudentsPersonManageMapper
-                .selectList(new QueryWrapper<AidingStudentsPersonManageDO>()
-                        .eq("college_id", pageReqVO.getCollegeId())
-                        .eq("manage_id", pageReqVO.getManageId())
-                        .eq(pageReqVO.getDifficultType() != null,"difficult_type", pageReqVO.getDifficultType())
-                        .like(StringUtils.isNotBlank(pageReqVO.getGrade()), "class_name", pageReqVO.getGrade())
-                        .like(StringUtils.isNotBlank(pageReqVO.getClName()), "class_name", pageReqVO.getClName())
-                        .like(StringUtils.isNotBlank(pageReqVO.getName()), "nickname", pageReqVO.getName())
-                        .like(StringUtils.isNotBlank(pageReqVO.getStudentSno()), "student_sno", pageReqVO.getStudentSno())
+                .selectList(new LambdaQueryWrapper<AidingStudentsPersonManageDO>()
+                        .eq(pageReqVO.getCollegeManageId() != null, AidingStudentsPersonManageDO::getCollegeId, pageReqVO.getCollegeManageId())
+                        .eq(pageReqVO.getManageId() != null ,AidingStudentsPersonManageDO::getManageId, pageReqVO.getManageId())
+                        .eq(pageReqVO.getDifficultType() != null,AidingStudentsPersonManageDO::getDifficultType, pageReqVO.getDifficultType())
+                        .like(StringUtils.isNotBlank(pageReqVO.getMajor()), AidingStudentsPersonManageDO::getMajor, pageReqVO.getMajor())
+                        .like(StringUtils.isNotBlank(pageReqVO.getGrade()), AidingStudentsPersonManageDO::getGrade, pageReqVO.getGrade())
+                        .like(StringUtils.isNotBlank(pageReqVO.getClName()), AidingStudentsPersonManageDO::getClassName, pageReqVO.getClName())
+                        .like(StringUtils.isNotBlank(pageReqVO.getName()), AidingStudentsPersonManageDO::getNickname, pageReqVO.getName())
+                        .like(StringUtils.isNotBlank(pageReqVO.getStudentSno()), AidingStudentsPersonManageDO::getStudentSno, pageReqVO.getStudentSno())
                 );
-        List<AidingStudentPersonManageTeacherRespVO> resultList = new ArrayList<>();
-        for (AidingStudentsPersonManageDO aDo : allList) {
-            AidingStudentPersonManageTeacherRespVO vo = new AidingStudentPersonManageTeacherRespVO();
-            vo = BeanUtils.toBean(aDo, AidingStudentPersonManageTeacherRespVO.class);
-            String str = "";
-            //计算机类2023-1班 应该都是这个格式，但是不确定
-            String className = aDo.getClassName();
-            for(int i = 0; i < className.length(); i++){
-                if(className.charAt(i) == '2'){
-                    vo.setMajor(str);
-                    str = String.valueOf(className.charAt(i));
-                }else if (className.charAt(i) == '-'){
-                    vo.setGrade(str);
-                    vo.setClName(className.substring(i + 1,className.length()));
-                    break;
-                }else {
-                    str += className.charAt(i);
-                }
+        return new PageResult<>(BeanUtils.toBean(allList, AidingStudentPersonManageSchoolRespVO.class), (long) allList.size());
+    }
+
+    /**
+     * 获取各个学院的部分信息
+     * @param manageId
+     * @return
+     */
+    @Override
+    public AidingStudentPersonManageDataPartRespVO schoolgetAidingStudentsPersonManageData(Integer manageId) {
+        AidingStudentPersonManageDataPartRespVO resultvo = new AidingStudentPersonManageDataPartRespVO();
+        // 1.获得这个项目的所有信息（不分学院）
+        List<AidingStudentsPersonManageDO> manageList = aidingStudentsPersonManageMapper
+                .selectList(new LambdaQueryWrapper<AidingStudentsPersonManageDO>()
+                        .eq(AidingStudentsPersonManageDO::getCollegeManageId, manageId));
+        int pass = 0;
+        for (AidingStudentsPersonManageDO aDo : manageList) {
+            if(aDo.getStatus() == 1){
+                pass++;
             }
-            resultList.add(vo);
         }
-        return new PageResult<>(resultList, (long) resultList.size());
+        resultvo.setCompletedNumber(pass);
+        resultvo.setAllsubmit(manageList.size());
+        // 2.获得各个学院的信息
+        QueryWrapper<AidingStudentsPersonManageDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("college_manage_id", "COUNT(*) as collgeNumber")
+                .groupBy("college_manage_id");
+        List<Map<String, Object>> maps = aidingStudentsPersonManageMapper.selectMaps(queryWrapper);
+        log.info("学院人数如下：maps {}", maps);
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (Map<String, Object> map : maps) {
+            Map<String, Object> temp = new HashMap<>();
+            temp.put("collegeManageId", map.get("college_manage_id"));
+            temp.put("all", map.get("collegeNumber"));
+            List<AidingStudentsPersonManageDO> passList = aidingStudentsPersonManageMapper
+                    .selectList(new LambdaQueryWrapper<AidingStudentsPersonManageDO>()
+                            .eq(AidingStudentsPersonManageDO::getCollegeId, map.get("collge_manage_id"))
+                            .eq(AidingStudentsPersonManageDO::getStatus, 1));
+            temp.put("pass", passList.size());
+            list.add(temp);
+        }
+        return resultvo.setCollegeNumber(list);
     }
 }

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

@@ -10,15 +10,15 @@
      -->
     <select id="selectPage"
             resultType="cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentspersonmanage.AidingStudentsPersonManageDO"
-            parameterType="cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentsPersonManagePageReqVO">
+            parameterType="cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentsPersonManageClassPageReqVO">
 
     </select>
     <select id="countByClassName" resultType="java.util.Map"
             parameterType="cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentPersonManagerCollegePageReqVO">
         select class_name, COUNT(*) AS count from as_aiding_students_person_manage
         <where>
-            <if test="collegeId != null">
-                and college_id = #{collegeId}
+            <if test="collegeManageId != null">
+                and college_manage_id = #{collegeManageId}
             </if>
             <if test="manageId != null">
                 and manage_id = #{manageId}