yzx 5 місяців тому
батько
коміт
bee55afeba

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

@@ -3,8 +3,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.framework.mybatis.core.query.LambdaQueryWrapperX;
-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 cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskPageReqVO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -23,7 +22,7 @@ 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())
@@ -35,6 +34,14 @@ public interface AidingStudentsPersonManageMapper extends BaseMapperX<AidingStud
     }
 
 
+
+
+    /**
+     * 根据学生ID查询data_info数据
+     * */
+    @Select("select * from data_student_info where student_id = #{Id}")
+    Map getByStudentId(String Id);
+
     default List<AidingStudentsPersonManageDO>  selectListByProcessInstanceId(List<String> ids,
                                                                               BpmTaskPageReqVO pageVO){
         return selectList(
@@ -48,19 +55,11 @@ public interface AidingStudentsPersonManageMapper extends BaseMapperX<AidingStud
         );
     }
 
-    /**
-     * 根据学生ID查询data_info数据
-     * */
-    @Select("select * from data_student_info where student_id = #{Id}")
-    Map getByStudentId(String Id);
-
-
-
     /**
      * 查询学院各个班的数量跟申请人数
      * @return
      */
-    List<Map<String, Object>> countByClassName(AidingStudentPersonManagerCollegePageReqVO pageReqVO);
+    List<Map<String, Object>> countByClassName(AidingStudentPersonManageInfoPageReqVO pageReqVO);
 
 
     /**