yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java

@@ -74,10 +74,7 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
         // 转换返回
         return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
     }
-
-    default T selectOne(String field, Object value) {
-        return selectOne(new QueryWrapper<T>().eq(field, value));
-    }
+    
 
     default T selectOne(SFunction<T, ?> field, Object value) {
         return selectOne(new LambdaQueryWrapper<T>().eq(field, value));

yudao-module-as/yudao-module-as-api/src/main/java/cn/iocoder/yudao/module/as/enums/ErrorCodeConstants.java

@@ -16,4 +16,7 @@ public interface ErrorCodeConstants {
     ErrorCode AIDING_STUDENTS_IMPORT_LIST_STUDENT_CODE_NOT_EXISTS = new ErrorCode(2_009_000_008,  "系统中不存在该学生学号");
 
 
+    ErrorCode STUDENT_INFO_EXISTS = new ErrorCode(2_009_000_009,  "学生信息已存在");
+    ErrorCode CLASS_DISCUSSION_INFO_EXISTS = new ErrorCode(2_009_000_010,  "班级材料已存在");
+
 }

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

@@ -32,71 +32,61 @@ public class AidingStudentsPersonManageController {
     @GetMapping("/before-upload")
     @Operation(summary = "回显学生上传材料")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:before-upload')")
-    public CommonResult<AidingStudentsPersonManageUploadRespVO> beforeuploadAidingStudentsPersonManage() {
+    public CommonResult<AidingStudentPersonManageInfoRespVO> beforeuploadAidingStudentsPersonManage() {
         return success(aidingStudentsPersonManageService.beforeuploadAidingStudentsManage());
     }
 
     @PostMapping("/upload")
     @Operation(summary = "学生上传材料")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:upload')")
-    public CommonResult<Boolean> uploadAidingStudentsPersonManage(@Valid @RequestBody AidingStudentsPersonManageUploadRespVO uploadVO) {
+    public CommonResult<Boolean> uploadAidingStudentsPersonManage(@Valid @RequestBody AidingStudentPersonManageInfoRespVO uploadVO) {
         aidingStudentsPersonManageService.uploadAidingStudentsManage(uploadVO);
         return success(true);
     }
 
     @GetMapping("/check")
-    @Operation(summary = "学生查看申请信息")
+    @Operation(summary = "学生查看自己的申请信息")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:check')")
-    public CommonResult<AidingStudentsPersonManageUploadRespVO> checkAidingStudentsPersonManage() {
+    public CommonResult<AidingStudentPersonManageInfoRespVO> checkAidingStudentsPersonManage() {
         return success(aidingStudentsPersonManageService.checkAidingStudentsManage());
     }
 
     @PutMapping("/edit")
     @Operation(summary = "学生修改申请信息")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:edit')")
-    public CommonResult<Boolean> editAidingStudentsPersonManage(@Valid @RequestBody AidingStudentsPersonManageUploadRespVO uploadVO) {
+    public CommonResult<Boolean> editAidingStudentsPersonManage(@Valid @RequestBody AidingStudentPersonManageInfoRespVO uploadVO) {
         aidingStudentsPersonManageService.editAidingStudentsManage(uploadVO);
         return success(true);
     }
 
     @GetMapping("/college-get-page")
-    @Operation(summary = "学院模糊查询获取学生申请名单分页")
+    @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));
+    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<AidingStudentsPersonManageClassRespVO>> getAidingStudentsPersonManagePage(@Valid @RequestBody AidingStudentsPersonManageClassPageReqVO pageReqVO) {
+    public CommonResult<PageResult<AidingStudentPersonManageInfoRespVO>> getAidingStudentsPersonManagePage(@Valid @RequestBody AidingStudentPersonManageInfoPageReqVO pageReqVO) {
         PageResult<AidingStudentsPersonManageDO> pageResult = aidingStudentsPersonManageService.getAidingStudentsPersonManageClassPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, AidingStudentsPersonManageClassRespVO.class));
-    }
+        return success(BeanUtils.toBean(pageResult, AidingStudentPersonManageInfoRespVO.class));
+    }*/
 
     @PutMapping("/all-sort")
-    @Operation(summary = "班级定序 - 集体")
+    @Operation(summary = "定序")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:all-sort')")
     public CommonResult<Boolean> allsortAidingStudentsPersonManage(@Valid @RequestBody List<AidingStudentPersonManageSortReqVO> ids){
         aidingStudentsPersonManageService.allsortAidingStudentsManage(ids);
         return success(true);
     }
 
-    @PutMapping("/person-sort")
-    @Operation(summary = "班级定序 - 单个人 - 防住发生错误")
-    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:person-sort')")
-    public CommonResult<Boolean> sortAidingStudentsPersonManage(@RequestParam("id") Long id,
-                                                                @RequestParam("sort")Integer sort,
-                                                                @RequestParam("difficultType")Integer difficultType){
-        aidingStudentsPersonManageService.sortAidingStudentsManage(id,sort,difficultType);
-        return success(true);
-    }
 
     @PostMapping("/upload-result")
     @Operation(summary = "班主任上传线下讨论结果照片")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:upload-result')")
-    public CommonResult<Boolean> uploadResultAidingStudentsPersonManage(@Valid @RequestBody AidingStudentPersonManageClassResultReqVO classuploadVO) {
+    public CommonResult<Boolean> uploadResultAidingStudentsPersonManage(@Valid @RequestBody AidingStudentPersonManageInfoPageReqVO classuploadVO) {
         aidingStudentsPersonManageService.uploadResultAidingStudentsManage(classuploadVO);
         return success(true);
     }
@@ -104,15 +94,26 @@ public class AidingStudentsPersonManageController {
     @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) {
+    public CommonResult<PageResult<AidingStudentPersonManageInfoRespVO>> schoolgetAidingStudentsPersonManagePage(@Valid @RequestBody AidingStudentPersonManageInfoPageReqVO pageReqVO) {
         return success(aidingStudentsPersonManageService.schoolgetAidingStudentsPersonManagePage(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) {
+    public CommonResult<AidingStudentPersonManageInfoRespVO> schoolgetAidingStudentsPersonManageData(@Valid @RequestParam("manageId")Integer manageId) {
         return success(aidingStudentsPersonManageService.schoolgetAidingStudentsPersonManageData(manageId));
     }
 
+    @GetMapping("/school-audit-student-info")
+    @Operation(summary = "学校审核学生信息")
+    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:school-audit-student-info')")
+    public CommonResult<AidingStudentPersonManageInfoRespVO> schoolauditAidingStudentsPersonManageData(@Valid @RequestParam("id")Integer id) {
+        return success(aidingStudentsPersonManageService.schoolauditAidingStudentsPersonManageData(id));
+    }
+
+
+
+
+
 }

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

@@ -1,30 +0,0 @@
-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;
-
-/**
- * @autor WoVoM
- * @data 2024/7/8 19:59
- * @@version 1.0
- */
-@Schema(description = "管理后台 - 家庭困难认定项目管理 班级Resp VO")
-@Data
-@ExcelIgnoreUnannotated
-public class AidingStudentPersonManageClassResultReqVO {
-
-    private String major;
-
-    private String grade;
-    // 班级
-    private String className;
-    // 班主任名字（负责人）
-    private String teacherName;
-    // 照片
-    private String image;
-    // 学院id
-    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,20 +13,18 @@ import lombok.Data;
 @Data
 @ExcelIgnoreUnannotated
 public class AidingStudentPersonManageClassVO {
+    // 专业
     private String major;
+    // 年级
     private String grade;
     // 班级名称
     private String className;
-
     // 审核人数
     private Integer classAll;
-
     // 待审核人数
     private Integer classAudit;
-
     // 待修改人数
     private Integer classEdit;
-
     // 已经通过人数
     private Integer classPass;
 }

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

@@ -1,33 +0,0 @@
-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;
-
-/**
- * @autor WoVoM
- * @data 2024/7/9 10:14
- * @@version 1.0
- */
-@Schema(description = "管理后台 - 家庭困难认定项目管理 学院 Resp VO")
-@Data
-@ExcelIgnoreUnannotated
-public class AidingStudentPersonManageCollegeRespVO {
-    private String major;
-    private String grade;
-    // 学院申请人数
-    private Integer collegeAll;
-
-    // 学院待审核人数
-    private Integer collegeAudit;
-
-    // 学院待修改人数
-    private Integer collegeEdit;
-
-    // 已经通过人数
-    private Integer collegePass;
-
-    private List<AidingStudentPersonManageClassVO> list;
-}

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

@@ -1,29 +0,0 @@
-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/AidingStudentsPersonManageClassPageReqVO.java → yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentspersonmanage/vo/AidingStudentPersonManageInfoPageReqVO.java

@@ -6,24 +6,36 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.time.LocalDateTime;
-
 /**
  * @autor WoVoM
- * @data 2024/7/8 18:40
+ * @data 2024/7/12 21:48
  * @@version 1.0
  */
 @Schema(description = "管理后台 - 家庭困难认定项目管理分页 - 学生 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class AidingStudentsPersonManageClassPageReqVO extends PageParam {
-    // 班级名称
+public class AidingStudentPersonManageInfoPageReqVO extends PageParam {
+    /**
+     * 公共字段
+     */
+    // 专业
+    private String major;
+    // 年级
+    private String grade;
+    // 班级
     private String className;
-    // 学院Id
+    // 班主任名字（负责人）
+    private String teacherName;
+    // 照片
+    private String image;
+    // 学院id
     private Integer collegeManageId;
     // 项目ID
     private Integer manageId;
+    /**
+     * 班级分页请求
+     */
     //姓名
     private String nickname;
     // 困难类型
@@ -32,6 +44,24 @@ public class AidingStudentsPersonManageClassPageReqVO extends PageParam {
     private String studentSno;
     // 状态
     private Integer status;
-    private String major;
-    private String grade;
+    /**
+     * 学院分页请求
+     */
+    // 学院项目ID
+    // 项目ID
+    // 专业
+    // 年级
+    // 班级
+    /**
+     * 学校分页请求
+     */
+    // 学院
+    private String collegeName;
+    // 项目ID
+    // 年级
+    // 班级
+    // 学号
+    // 姓名
+    // 申请类型
+    // 专业
 }

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

@@ -0,0 +1,149 @@
+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.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+
+ * @autor WoVoM
+    * @data 2024/7/12 20:58
+    * @@version 1.0
+    */
+@Schema(description = "管理后台 - 家庭困难认定项目管理 班级Resp VO")
+@Data
+@ExcelIgnoreUnannotated
+public class AidingStudentPersonManageInfoRespVO {
+
+    /**
+     * 公共字段
+     */
+    // 序号（主键）
+    private Integer id;
+    // 专业
+    private String major;
+    // 年级
+    private String grade;
+    // 姓名
+    private String nickname;
+    // 困难类型
+    private Integer difficultType;
+    // 附件PDF
+    private String pdf;
+    // 证明材料
+    private String evidence;
+    // 排序
+    private Integer sort;
+    // 学院项目id
+    private Integer collegeManageId;
+    // 项目ID
+    private Integer manageId;
+    // 班级
+    private String className;
+    // 备注
+    private String notes;
+    // 学号
+    private String studentSno;
+    // 入学年份
+    private String enrollmentYear;
+    //身份证号
+    private String idCard;
+    // 户籍地
+    private String registeredResidence;
+    // 状态
+    private Integer status;
+    // 班级建议困难类型
+    private Integer classSuggestionDifficultType;
+    // 学院建议困难类型
+    private Integer collegeSuggestionDifficultType;
+    // 学校建议困难类型
+    private Integer schoolSuggestionDifficultType;
+    /**
+     * 学生（上传材料）
+     */
+    // id
+    //姓名
+
+
+    /**
+     * 班级
+     */
+    //姓名
+    // 困难类型
+    // 附件PDF
+    // 证明材料
+    // 排序
+    // 学院id
+    // 项目ID
+    // 班级
+    // 备注
+    // 学号
+    // 入学年份
+    //身份证号
+    // 户籍地
+    // 状态
+    // 专业名称
+    // 年级
+
+
+    /**
+     * 学院
+     */
+    /**
+     * 数据部分
+     */
+    // 学院申请人数
+    private Integer collegeAll;
+    // 学院待审核人数
+    private Integer collegeAudit;
+    // 学院待修改人数
+    private Integer collegeEdit;
+    // 已经通过人数
+    private Integer collegePass;
+    // 待民主评议班级数量
+    private Integer waitingForEvaluationNumber;
+    // 已经评议班级数量
+    private Integer doneEvaluationNumber;
+    // 各个班级封装的信息
+    private List<AidingStudentPersonManageClassVO> list;
+
+    // TODO 往年申请人数、审批通过人数(没有项目编号跟学院项目编号，不太好找)
+
+    /**
+     * 学校
+     */
+
+    // 表格
+    // id
+    // 学院名字
+    private String collegeName;
+    // 年级
+    // 专业
+    // 班级
+    // 学院 项目管理ID
+    // 学号
+    // 姓名
+    // 申请类型
+    // 申请时间
+
+    private LocalDateTime createTime;
+    // 状态（待审核，待民主平移，通过，公示中，待学校审核，学校公示中，规定整理中，已经完结）
+
+
+    /**
+     * 补充部分数据
+     */
+    // 提交人数
+    private Integer allsubmit;
+    // 审批完成人数
+    private Integer completedNumber;
+    // 各个学院申请人数\通过人数
+    private List<Map<String, Object>> collegeNumber;
+    // 班级民主评议表
+    private String image;
+
+}

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

@@ -1,36 +0,0 @@
-package cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * @autor WoVoM
- * @data 2024/7/10 10:06
- * @@version 1.0
- */
-@Schema(description = "管理后台 - 家庭困难认定项目管理分页 - 学生 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class AidingStudentPersonManageSchoolPageReqVO extends PageParam {
-    // 学院
-    private String collegeName;
-    // 项目ID
-    private Integer manageId;
-    // 年级
-    private String grade;
-    // 班级
-    private String clName;
-    // 学号
-    private String studentSno;
-    // 姓名
-    private String nickname;
-    // 申请类型
-    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/AidingStudentPersonManageSchoolRespVO.java

@@ -1,45 +0,0 @@
-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.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @autor WoVoM
- * @data 2024/7/10 9:50
- * @@version 1.0
- */
-@Schema(description = "管理后台 - 家庭困难认定项目管理 班级Resp VO")
-@Data
-@ExcelIgnoreUnannotated
-public class AidingStudentPersonManageSchoolRespVO {
-    /**
-     * 表格需要数据
-     */
-    // id
-    private Integer id;
-    // 学院
-    private String collegeName;
-    // 年级
-    private String grade;
-    // 专业
-    private String major;
-    // 班级
-    private String className;
-    // 学院 项目管理ID
-    private Integer collegeManageId;
-    // 学号
-    private String studentSno;
-    // 姓名
-    private String nickname;
-    // 申请类型
-    private Integer difficultType;
-    // 申请时间
-    private LocalDateTime createTime;
-    // 状态（待审核，待民主平移，通过，公示中，待学校审核，学校公示中，规定整理中，已经完结）
-    private Integer status;
-}

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

@@ -18,9 +18,14 @@ public class AidingStudentPersonManageSortReqVO {
     private Integer id;
     // 排序
     private Integer sort;
-    // 困难类型
-    private Integer difficultType;
-
+    // 班级建议困难类型
+    private Integer classSuggestionDifficultType;
+    // 学院建议困难类型
+    private Integer collegeSuggestionDifficultType;
+    // 学校建议困难类型
+    private Integer schoolSuggestionDifficultType;
+    // 专业
     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

@@ -1,38 +0,0 @@
-package cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.util.List;
-
-/**
- * @autor WoVoM
- * @data 2024/7/9 10:19
- * @@version 1.0
- */
-@Schema(description = "管理后台 - 家庭困难认定项目管理分页 - 学生 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class AidingStudentPersonManagerCollegePageReqVO extends PageParam {
-
-    // 学院项目Id
-    private Integer collegeManageId;
-
-    // 项目ID
-    private Integer manageId;
-
-    // 专业
-    private String major;
-
-    // 年级
-    private String grade;
-
-    // 班级
-    private String clName;
-
-
-}

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

@@ -1,51 +0,0 @@
-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.time.LocalDateTime;
-
-/**
- * @autor WoVoM
- * @data 2024/7/8 16:33
- * @@version 1.0
- */
-@Schema(description = "管理后台 - 家庭困难认定项目管理 Resp VO")
-@Data
-@ExcelIgnoreUnannotated
-public class AidingStudentsPersonManageClassRespVO {
-    private Integer id;
-    //姓名
-    private String nickname;
-    // 困难类型
-    private Integer difficultType;
-    // 附件PDF
-    private String pdf;
-    // 证明材料
-    private String evidence;
-    // 排序
-    private Integer sort;
-    // 学院id
-    private Integer collegeManageId;
-    // 项目ID
-    private Integer manageId;
-    // 班级 ：计算机类2023-1班
-    private String className;
-    // 备注
-    private String notes;
-    // 学号
-    private String studentSno;
-    // 入学年份
-    private String enrollmentYear;
-    //身份证号
-    private String idCard;
-    // 户籍地
-    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/AidingStudentsPersonManageUploadRespVO.java

@@ -1,50 +0,0 @@
-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.time.LocalDateTime;
-
-/**
- * @autor WoVoM
- * @data 2024/7/8 15:57
- * @@version 1.0
- */
-@Schema(description = "管理后台 - 家庭困难认定项目管理 Upload VO")
-@Data
-@ExcelIgnoreUnannotated
-public class AidingStudentsPersonManageUploadRespVO {
-    // id
-    private Integer id;
-    //姓名
-    private String nickname;
-    // 困难类型
-    private Integer difficultType;
-    // 附件PDF
-    private String pdf;
-    // 证明材料
-    private String evidence;
-    // 排序
-    private Integer sort;
-    // 学院项目id
-    private Integer collegeManageId;
-    // 项目ID
-    private Integer manageId;
-    // 班级
-    private String className;
-    // 备注
-    private String notes;
-    // 学号
-    private String studentSno;
-    // 入学年份
-    private String enrollmentYear;
-    //身份证号
-    private String idCard;
-    // 户籍地
-    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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
 /**
+ * 班主任上传班级评审材料（图片）
  * @autor WoVoM
  * @data 2024/7/8 19:48
  * @@version 1.0
@@ -36,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/dataobject/aidingstudentspersonmanage/AidingStudentsPersonManageDO.java

@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
-import java.time.LocalDateTime;
 
 /**
+ * 学生上传申请材料相关信息
  * @autor WoVoM
  * @data 2024/7/8 15:40
  * @@version 1.0
@@ -25,8 +25,6 @@ public class AidingStudentsPersonManageDO extends BaseDO {
     // 序号
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-
-
     //姓名
     private String nickname;
     // 困难类型
@@ -65,4 +63,10 @@ public class AidingStudentsPersonManageDO extends BaseDO {
     private String grade;
     // 所在院系名称
     private String collegeName;
+    // 班级建议困难类型
+    private Integer classSuggestionDifficultType;
+    // 学院建议困难类型
+    private Integer collegeSuggestionDifficultType;
+    // 学校建议困难类型
+    private Integer schoolSuggestionDifficultType;
 }

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

@@ -2,8 +2,7 @@ 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.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentPersonManagerCollegePageReqVO;
-import cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentsPersonManageClassPageReqVO;
+import cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentPersonManageInfoPageReqVO;
 import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentspersonmanage.AidingStudentsPersonManageDO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang3.StringUtils;
@@ -21,16 +20,16 @@ import java.util.Map;
 @Mapper
 public interface AidingStudentsPersonManageMapper extends BaseMapperX<AidingStudentsPersonManageDO> {
 
-    default PageResult<AidingStudentsPersonManageDO> selectPage(AidingStudentsPersonManageClassPageReqVO 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数据
@@ -44,7 +43,7 @@ public interface AidingStudentsPersonManageMapper extends BaseMapperX<AidingStud
      * 查询学院各个班的数量跟申请人数
      * @return
      */
-    List<Map<String, Object>> countByClassName(AidingStudentPersonManagerCollegePageReqVO pageReqVO);
+    List<Map<String, Object>> countByClassName(AidingStudentPersonManageInfoPageReqVO pageReqVO);
 
 
     /**

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

@@ -16,52 +16,45 @@ public interface AidingStudentsPersonManageService  {
      *
      * @return
      */
-    AidingStudentsPersonManageUploadRespVO beforeuploadAidingStudentsManage();
+    AidingStudentPersonManageInfoRespVO beforeuploadAidingStudentsManage();
     /**
      * 学生上传材料
      * @param uploadVO
      * @return
      */
-    void uploadAidingStudentsManage(AidingStudentsPersonManageUploadRespVO uploadVO);
+    void uploadAidingStudentsManage(AidingStudentPersonManageInfoRespVO uploadVO);
 
     /**
      * 获取学生申请信息分页
      * @param pageReqVO
      * @return
-     */
-    PageResult<AidingStudentsPersonManageDO> getAidingStudentsPersonManageClassPage(AidingStudentsPersonManageClassPageReqVO pageReqVO);
-
+     *//*
+    PageResult<AidingStudentsPersonManageDO> getAidingStudentsPersonManageClassPage(AidingStudentPersonManageInfoPageReqVO pageReqVO);*/
 
-    /**
-     * 班级定序
-     * @param id
-     * @param sort
-     */
-    void sortAidingStudentsManage(Long id, Integer sort,Integer difficultType);
 
     /**
      * 班主任上传线下讨论结果信息
      * @param classuploadVO
      */
-    void uploadResultAidingStudentsManage(AidingStudentPersonManageClassResultReqVO classuploadVO);
+    void uploadResultAidingStudentsManage(AidingStudentPersonManageInfoPageReqVO classuploadVO);
 
     /**
      * 学生查看申请信息
      */
-    AidingStudentsPersonManageUploadRespVO checkAidingStudentsManage();
+    AidingStudentPersonManageInfoRespVO checkAidingStudentsManage();
 
     /**
      * 学生修改申请信息
      * @param uploadVO
      */
-    void editAidingStudentsManage(AidingStudentsPersonManageUploadRespVO uploadVO);
+    void editAidingStudentsManage(AidingStudentPersonManageInfoRespVO uploadVO);
 
     /**
-     * 学院获取各个班级的分页信息
+     * 学院获取各个班级的信息统计
      * @param pageReqVO
      * @return
      */
-    PageResult<AidingStudentPersonManageCollegeRespVO> getAidingStudentsPersonManageCollegePage(AidingStudentPersonManagerCollegePageReqVO pageReqVO);
+    PageResult<AidingStudentPersonManageInfoRespVO> getAidingStudentsPersonManageCollegeData(AidingStudentPersonManageInfoPageReqVO pageReqVO);
 
     /**
      * 班级定序，集体
@@ -75,12 +68,19 @@ public interface AidingStudentsPersonManageService  {
      * @param pageReqVO
      * @return
      */
-    PageResult<AidingStudentPersonManageSchoolRespVO> schoolgetAidingStudentsPersonManagePage(AidingStudentPersonManageSchoolPageReqVO pageReqVO);
+    PageResult<AidingStudentPersonManageInfoRespVO> schoolgetAidingStudentsPersonManagePage(AidingStudentPersonManageInfoPageReqVO pageReqVO);
 
     /**
      * 获取各个学院的部分信息
      * @param manageId
      * @return
      */
-    AidingStudentPersonManageDataPartRespVO schoolgetAidingStudentsPersonManageData(Integer manageId);
+    AidingStudentPersonManageInfoRespVO schoolgetAidingStudentsPersonManageData(Integer manageId);
+
+    /**
+     * 学校审核学生信息
+     * @param id
+     * @return
+     */
+    AidingStudentPersonManageInfoRespVO schoolauditAidingStudentsPersonManageData(Integer id);
 }

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

@@ -12,6 +12,7 @@ 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.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -20,7 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.*;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
+import static cn.iocoder.yudao.module.as.enums.ErrorCodeConstants.*;
 
 /**
  * @autor WoVoM
@@ -48,22 +52,15 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
      * @return
      */
     @Override
-    public AidingStudentsPersonManageUploadRespVO beforeuploadAidingStudentsManage() {
+    public AidingStudentPersonManageInfoRespVO beforeuploadAidingStudentsManage() {
         try {
             AdminUserRespDTO user = adminUserApi.getUser(getLoginUser().getId());
-            AidingStudentsPersonManageUploadRespVO result = new AidingStudentsPersonManageUploadRespVO();
-            // 获取当前登录的用户表
+            AidingStudentPersonManageInfoRespVO result = new AidingStudentPersonManageInfoRespVO();
             Map map = aidingStudentsPersonManageMapper.getByStudentId(user.getStudentId());
-            log.info("map = {}" , map);
-            // *班级名称
             result.setClassName((String) map.get("SZBJMC"));
-            // *学号
             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) {
@@ -78,31 +75,30 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
      * @return
      */
     @Override
-    public void uploadAidingStudentsManage(AidingStudentsPersonManageUploadRespVO uploadVO) {
+    public void uploadAidingStudentsManage(AidingStudentPersonManageInfoRespVO uploadVO) {
+        // 0.检查数据库是否已经存在该信息
+        AidingStudentsPersonManageDO user1 = aidingStudentsPersonManageMapper
+                .selectOne(new LambdaQueryWrapper<AidingStudentsPersonManageDO>()
+                        .eq(AidingStudentsPersonManageDO::getManageId, uploadVO.getManageId())
+                        .eq(AidingStudentsPersonManageDO::getCollegeManageId, uploadVO.getCollegeManageId())
+                        .eq(AidingStudentsPersonManageDO::getStudentSno, uploadVO.getStudentSno()));
+        if(user1 != null){
+            throw exception(STUDENT_INFO_EXISTS);
+        }
         // 1.获取当前登录的用户表
         AidingStudentsPersonManageDO aDo = BeanUtils.toBean(uploadVO, AidingStudentsPersonManageDO.class);
         AdminUserRespDTO user =  adminUserApi.getUser(getLoginUser().getId());
         Map map = aidingStudentsPersonManageMapper.getByStudentId(user.getStudentId());
         // 2.补充字段
         // 项目ID跟学院项目ID前端传
-
-        // 学院ID
         Long collegeId = deptApi.getCollegeId(user.getDeptId());
         aDo.setCollegeId(collegeId);
-
         Map resultmap = aidingStudentsPersonManageMapper.getMajorById(map.get("SZZYM"));
-        log.info("resultMap = {}", resultmap);
-        // 专业名称
         aDo.setMajor((String) resultmap.get("ZYMC"));
-        // 学院名称
         aDo.setCollegeName((String) resultmap.get("DWMC"));
-        // 年级
         aDo.setGrade((String) map.get("SZNJ"));
-        // 姓名
         aDo.setNickname(user.getNickname());
-        // 状态
         aDo.setStatus(0);
-        // 用户ID
         aidingStudentsPersonManageMapper.insert(aDo);
     }
 
@@ -110,11 +106,11 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
      * 学生查看自己的申请信息
      */
     @Override
-    public AidingStudentsPersonManageUploadRespVO checkAidingStudentsManage() {
-        AdminUserRespDTO Loginuser =  adminUserApi.getUser(getLoginUser().getId());
-        AidingStudentsPersonManageDO user = aidingStudentsPersonManageMapper
-                .selectOne(AidingStudentsPersonManageDO::getStudentSno, Loginuser.getStudentId());
-        return BeanUtils.toBean(user, AidingStudentsPersonManageUploadRespVO.class);
+    public AidingStudentPersonManageInfoRespVO checkAidingStudentsManage() {
+        return BeanUtils
+                .toBean(aidingStudentsPersonManageMapper
+                .selectOne(AidingStudentsPersonManageDO::getStudentSno, adminUserApi.getUser(getLoginUser().getId()).getStudentId())
+                        , AidingStudentPersonManageInfoRespVO.class);
     }
 
     /**
@@ -122,30 +118,29 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
      * @param uploadVO
      */
     @Override
-    public void editAidingStudentsManage(AidingStudentsPersonManageUploadRespVO uploadVO) {
-        AidingStudentsPersonManageDO aDo = new AidingStudentsPersonManageDO();
-         aDo = BeanUtils.toBean(uploadVO, AidingStudentsPersonManageDO.class);
-         aDo.setRejectNotes("");
-         aidingStudentsPersonManageMapper.updateById(aDo);
+    public void editAidingStudentsManage(AidingStudentPersonManageInfoRespVO uploadVO) {
+         aidingStudentsPersonManageMapper.updateById(BeanUtils.toBean(uploadVO, AidingStudentsPersonManageDO.class));
     }
 
     /**
-     * 学院获取各个班级的分页信息
+     * 学院获取各个班级数据统计
      * @param pageReqVO
      * @return
      */
     @Override
-    public PageResult<AidingStudentPersonManageCollegeRespVO> getAidingStudentsPersonManageCollegePage(
-            AidingStudentPersonManagerCollegePageReqVO pageReqVO) {
-        AidingStudentPersonManageCollegeRespVO vo = new AidingStudentPersonManageCollegeRespVO();
+    public PageResult<AidingStudentPersonManageInfoRespVO> getAidingStudentsPersonManageCollegeData(
+            AidingStudentPersonManageInfoPageReqVO pageReqVO) {
+        AidingStudentPersonManageInfoRespVO vo = new AidingStudentPersonManageInfoRespVO();
         List<AidingStudentPersonManageClassVO> list = new ArrayList<>();
+        // 1.模糊查询
         List<AidingStudentsPersonManageDO> allList = aidingStudentsPersonManageMapper
                 .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()));
+                        .like(StringUtils.isNotBlank(pageReqVO.getClassName()), AidingStudentsPersonManageDO::getClassName, pageReqVO.getClassName()));
+        // 2.统计学院学生信息状态
         int wait = 0, edit = 0, pass = 0;
         for (int i = 0; i < allList.size(); i++) {
             AidingStudentsPersonManageDO aDo = allList.get(i);
@@ -163,20 +158,24 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
         vo.setCollegeAudit(wait);
         vo.setCollegeEdit(edit);
         vo.setCollegePass(pass);
-        log.info("vo信息如下{}", vo);
-        log.info("pageVo信息如下{}", pageReqVO);
+        // 3.查看班级数量
         List<Map<String, Object>> maps = aidingStudentsPersonManageMapper
                 .countByClassName(pageReqVO);
-        log.info("map信息如下{}", maps);
+        // 3.1 各班民主评议情况
+        List<AidingStudentPersonManageEvaluationResultDO> reviewList = aidingStudentPersonManageEvaluationResultMapper
+                .selectList(new LambdaQueryWrapper<AidingStudentPersonManageEvaluationResultDO>()
+                        .eq(AidingStudentPersonManageEvaluationResultDO::getCollegeManageId, pageReqVO.getCollegeManageId())
+                        .eq(AidingStudentPersonManageEvaluationResultDO::getManageId, pageReqVO.getManageId()));
+        vo.setDoneEvaluationNumber(reviewList.size());
+        vo.setWaitingForEvaluationNumber(maps.size() - reviewList.size() );
+        // 3.2 统计各个班级完成的情况
         for (Map<String, Object> map : maps) {
-            log.info("遍历Map{}", map);
             AidingStudentPersonManageClassVO classVo = new AidingStudentPersonManageClassVO();
             List<AidingStudentsPersonManageDO> classList = aidingStudentsPersonManageMapper
                     .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;
             pass = 0;
@@ -191,7 +190,6 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
                 } else {
                 }
             }
-            log.info("classVo 如下{}", classVo);
             classVo.setClassName((String) map.get("class_name"));
             classVo.setClassAll(classList.size());
             classVo.setClassAudit(wait);
@@ -199,14 +197,13 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
             classVo.setClassPass(pass);
             list.add(classVo);
         }
+
+        // 4.封装返回
         vo.setList(list);
-        log.info("vo = {}", vo);
         Long total = Long.valueOf(list.size());
-        log.info("total = {}", total);
-        List<AidingStudentPersonManageCollegeRespVO> Tlist = new ArrayList<>();
+        List<AidingStudentPersonManageInfoRespVO> Tlist = new ArrayList<>();
         Tlist.add(vo);
-        log.info("Tlist = {}", Tlist);
-        PageResult<AidingStudentPersonManageCollegeRespVO> result = new PageResult<>(Tlist, total);
+        PageResult<AidingStudentPersonManageInfoRespVO> result = new PageResult<>(Tlist, total);
         return result;
     }
 
@@ -215,37 +212,30 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
      * @param pageReqVO
      * @return
      */
-    @Override
+    /*@Override
     public PageResult<AidingStudentsPersonManageDO> getAidingStudentsPersonManageClassPage(
-            AidingStudentsPersonManageClassPageReqVO pageReqVO) {
+            AidingStudentPersonManageInfoPageReqVO pageReqVO) {
         return aidingStudentsPersonManageMapper.selectPage(pageReqVO);
-    }
+    }*/
 
     /**
-     * 班级定序 - 集体
+     * 定序与建议等级
      * @param ids
      */
     @Override
     public void allsortAidingStudentsManage(List<AidingStudentPersonManageSortReqVO> ids) {
         for (AidingStudentPersonManageSortReqVO id : ids) {
-            sortAidingStudentsManage(Long.valueOf(id.getId()), id.getSort(), id.getDifficultType());
-        }
-    }
-
-    /**
-     * 班级定序 - 个人
-     * @param id
-     * @param sort
-     */
-    @Override
-    public void sortAidingStudentsManage(Long id, Integer sort, Integer difficultType) {
-        UpdateWrapper<AidingStudentsPersonManageDO> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", id)
-                .set("sort", sort);
-        if(difficultType != null){
-            updateWrapper.set("difficult_type", difficultType);
+            LambdaUpdateWrapper<AidingStudentsPersonManageDO> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(AidingStudentsPersonManageDO::getId, id.getId())
+                    .set(AidingStudentsPersonManageDO::getSort, id.getSort());
+            if (id.getClassSuggestionDifficultType() != null)
+                updateWrapper.set(AidingStudentsPersonManageDO::getClassSuggestionDifficultType, id.getClassSuggestionDifficultType());
+            else if (id.getCollegeSuggestionDifficultType() != null)
+                updateWrapper.set(AidingStudentsPersonManageDO::getCollegeSuggestionDifficultType, id.getCollegeSuggestionDifficultType());
+            else if (id.getSchoolSuggestionDifficultType() != null)
+                updateWrapper.set(AidingStudentsPersonManageDO::getSchoolSuggestionDifficultType, id.getSchoolSuggestionDifficultType());
+            aidingStudentsPersonManageMapper.update(null, updateWrapper);
         }
-        aidingStudentsPersonManageMapper.update(null, updateWrapper);
     }
 
     /**
@@ -253,7 +243,15 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
      * @param classuploadVO
      */
     @Override
-    public void uploadResultAidingStudentsManage(AidingStudentPersonManageClassResultReqVO classuploadVO) {
+    public void uploadResultAidingStudentsManage(AidingStudentPersonManageInfoPageReqVO classuploadVO) {
+        AidingStudentPersonManageEvaluationResultDO aidingStudentPersonManageEvaluationResultDO = aidingStudentPersonManageEvaluationResultMapper
+                .selectOne(new LambdaQueryWrapper<AidingStudentPersonManageEvaluationResultDO>()
+                        .eq(AidingStudentPersonManageEvaluationResultDO::getCollegeManageId, classuploadVO.getCollegeManageId())
+                        .eq(AidingStudentPersonManageEvaluationResultDO::getManageId, classuploadVO.getManageId())
+                        .eq(AidingStudentPersonManageEvaluationResultDO::getClassName, classuploadVO.getClassName()));
+        if(aidingStudentPersonManageEvaluationResultDO != null){
+            throw exception(CLASS_DISCUSSION_INFO_EXISTS);
+        }
         AidingStudentPersonManageEvaluationResultDO ado = new AidingStudentPersonManageEvaluationResultDO();
         org.springframework.beans.BeanUtils.copyProperties(classuploadVO,ado);
         ado.setStatus(1);
@@ -262,12 +260,12 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
 
 
     /**
-     * (学校)办公室老师获取学生分页信息
+     * 学生分页信息
      * @param pageReqVO
      * @return
      */
     @Override
-    public PageResult<AidingStudentPersonManageSchoolRespVO> schoolgetAidingStudentsPersonManagePage(AidingStudentPersonManageSchoolPageReqVO pageReqVO) {
+    public PageResult<AidingStudentPersonManageInfoRespVO> schoolgetAidingStudentsPersonManagePage(AidingStudentPersonManageInfoPageReqVO pageReqVO) {
         /**
          * 表格信息
          */
@@ -276,29 +274,29 @@ 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.getClName()), AidingStudentsPersonManageDO::getClassName, pageReqVO.getClName())
+                        .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)
                 );
-        log.info("allList = {}", allList);
-        return new PageResult<>(BeanUtils.toBean(allList, AidingStudentPersonManageSchoolRespVO.class), (long) allList.size());
+        return new PageResult<>(BeanUtils.toBean(allList, AidingStudentPersonManageInfoRespVO.class), (long) allList.size());
     }
 
     /**
-     * 获取各个学院的部分信息
+     * 学校-获取各个学院的数据
      * @param manageId
      * @return
      */
     @Override
-    public AidingStudentPersonManageDataPartRespVO schoolgetAidingStudentsPersonManageData(Integer manageId) {
-        AidingStudentPersonManageDataPartRespVO resultvo = new AidingStudentPersonManageDataPartRespVO();
+    public AidingStudentPersonManageInfoRespVO schoolgetAidingStudentsPersonManageData(Integer manageId) {
+        AidingStudentPersonManageInfoRespVO resultvo = new AidingStudentPersonManageInfoRespVO();
         // 1.获得这个项目的所有信息（不分学院）
         List<AidingStudentsPersonManageDO> manageList = aidingStudentsPersonManageMapper
                 .selectList(new LambdaQueryWrapper<AidingStudentsPersonManageDO>()
                         .eq(AidingStudentsPersonManageDO::getCollegeManageId, manageId));
-        log.info("获取所有学院信息如下{}", manageList);
         int pass = 0;
         for (AidingStudentsPersonManageDO aDo : manageList) {
             if(aDo.getStatus() == 1){
@@ -312,14 +310,11 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
         queryWrapper.select("college_id", "COUNT(*) as collegeNumber")
                 .groupBy("college_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<>();
             Long collegeId = (Long) map.get("college_id");
             DeptRespDTO dept = deptApi.getDept(collegeId);
-            log.info("collegeId = {}, dept {}", collegeId, dept);
-            // dept DeptRespDTO(id=18429, name=计算机科学与工程学院, parentId=0, leaderUserId=null, status=0)
             temp.put("collegeName", dept.getName());
             temp.put("all", map.get("collegeNumber"));
             List<AidingStudentsPersonManageDO> passList = aidingStudentsPersonManageMapper
@@ -331,4 +326,21 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
         }
         return resultvo.setCollegeNumber(list);
     }
+
+    /**
+     * 学校审核学生信息
+     * @param id
+     * @return
+     */
+    @Override
+    public AidingStudentPersonManageInfoRespVO schoolauditAidingStudentsPersonManageData(Integer id) {
+        AidingStudentsPersonManageDO aDo = aidingStudentsPersonManageMapper.selectById(id);
+        AidingStudentPersonManageEvaluationResultDO aidingStudentPersonManageEvaluationResultDO = aidingStudentPersonManageEvaluationResultMapper
+                .selectOne(null,new LambdaQueryWrapper<AidingStudentsPersonManageDO>()
+                        .eq(AidingStudentsPersonManageDO::getClassName, aDo.getClassName()));
+        AidingStudentPersonManageInfoRespVO vo = new AidingStudentPersonManageInfoRespVO();
+        vo = BeanUtils.toBean(aDo, AidingStudentPersonManageInfoRespVO.class);
+        vo = BeanUtils.toBean(aidingStudentPersonManageEvaluationResultDO, AidingStudentPersonManageInfoRespVO.class);
+        return vo;
+    }
 }

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

@@ -10,11 +10,11 @@
      -->
     <select id="selectPage"
             resultType="cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentspersonmanage.AidingStudentsPersonManageDO"
-            parameterType="cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentsPersonManageClassPageReqVO">
+            parameterType="cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentPersonManageInfoPageReqVO">
 
     </select>
     <select id="countByClassName" resultType="java.util.Map"
-            parameterType="cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentPersonManagerCollegePageReqVO">
+            parameterType="cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentPersonManageInfoPageReqVO">
         select class_name, COUNT(*) AS count from as_aiding_students_person_manage
         <where>
             <if test="collegeManageId != null">
@@ -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