学生提交申请信息V6.0

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

@@ -13,7 +13,9 @@ import lombok.Data;
 @Data
 @ExcelIgnoreUnannotated
 public class AidingStudentPersonManageClassResultReqVO {
+
     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/AidingStudentPersonManageSchoolPageReqVO.java

@@ -17,7 +17,7 @@ import lombok.ToString;
 @ToString(callSuper = true)
 public class AidingStudentPersonManageSchoolPageReqVO extends PageParam {
     // 学院
-    private Integer collegeManageId;
+    private String collegeName;
     // 项目ID
     private Integer manageId;
     // 年级
@@ -27,10 +27,10 @@ public class AidingStudentPersonManageSchoolPageReqVO extends PageParam {
     // 学号
     private String studentSno;
     // 姓名
-    private String name;
+    private String nickname;
     // 申请类型
     private Integer difficultType;
     // 专业
-    private String major;;
+    private String major;
 
 }

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

@@ -22,23 +22,24 @@ public class AidingStudentPersonManageSchoolRespVO {
      */
     // id
     private Integer id;
-    // 学院 项目管理ID
-    private Integer collegeManageId;
-    //计算机类2023-1班
+    // 学院
+    private String collegeName;
     // 年级
     private String grade;
     // 专业
     private String major;
     // 班级
-    private String clName;
+    private String className;
+    // 学院 项目管理ID
+    private Integer collegeManageId;
     // 学号
     private String studentSno;
     // 姓名
-    private String name;
+    private String nickname;
     // 申请类型
     private Integer difficultType;
     // 申请时间
-    private LocalDateTime time;
+    private LocalDateTime createTime;
     // 状态（待审核，待民主平移，通过，公示中，待学校审核，学校公示中，规定整理中，已经完结）
     private Integer status;
 }

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

@@ -52,6 +52,6 @@ public interface AidingStudentsPersonManageMapper extends BaseMapperX<AidingStud
      * @param szzym
      */
 
-    @Select("select ZYMC from data_professional_info where ZYM = #{szzym}")
+    @Select("select ZYMC, DWMC 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/AidingStudentsPersonManageServiceImpl.java

@@ -89,13 +89,13 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
         // 学院ID
         Long collegeId = deptApi.getCollegeId(user.getDeptId());
         aDo.setCollegeId(collegeId);
-        // 学院名称
-        DeptRespDTO dept = deptApi.getDept(user.getDeptId());
-        aDo.setCollegeName(dept.getName());
+
+        Map resultmap = aidingStudentsPersonManageMapper.getMajorById(map.get("SZZYM"));
+        log.info("resultMap = {}", resultmap);
         // 专业名称
-        Map szzym = aidingStudentsPersonManageMapper.getMajorById(map.get("SZZYM"));
-        log.info("szzym = {}", szzym);
-        aDo.setMajor((String) szzym.get("ZYMC"));
+        aDo.setMajor((String) resultmap.get("ZYMC"));
+        // 学院名称
+        aDo.setCollegeName((String) resultmap.get("DWMC"));
         // 年级
         aDo.setGrade((String) map.get("SZNJ"));
         // 姓名
@@ -273,15 +273,16 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
          */
         List<AidingStudentsPersonManageDO> allList = aidingStudentsPersonManageMapper
                 .selectList(new LambdaQueryWrapper<AidingStudentsPersonManageDO>()
-                        .eq(pageReqVO.getCollegeManageId() != null, AidingStudentsPersonManageDO::getCollegeId, pageReqVO.getCollegeManageId())
+                        .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())
                         .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.getNickname()), AidingStudentsPersonManageDO::getNickname, pageReqVO.getNickname())
                         .like(StringUtils.isNotBlank(pageReqVO.getStudentSno()), AidingStudentsPersonManageDO::getStudentSno, pageReqVO.getStudentSno())
                 );
+        log.info("allList = {}", allList);
         return new PageResult<>(BeanUtils.toBean(allList, AidingStudentPersonManageSchoolRespVO.class), (long) allList.size());
     }