Browse Source

班主任确认教材页面传入班级id,不考虑一个班主任多个班级的情况了

大数据与最优化研究所 5 months ago
parent
commit
d3ad9b7a8c

+ 1 - 1
src/main/java/com/xjrsoft/module/textbook/dto/TeacherCheckByclassDto.java

@@ -25,7 +25,7 @@ public class TeacherCheckByclassDto extends PageInput {
      * 班级编号
      */
     @ApiModelProperty(value = "班级编号")
-    private List<Long> classIdList;
+    private Long classId;
     /**
      * 领取情况(1=全部数据,2=该教材全部领取,3=该教材部分未领取)
      */

+ 5 - 9
src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookStudentClaimServiceImpl.java

@@ -559,24 +559,20 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
     @Override
     public IPage<TeacherCheckByclassVo> getTeacherCheckByclassList(TeacherCheckByclassDto dto) {
         // 如果没有传入班级id
-        if (ObjectUtils.isEmpty(dto.getClassIdList())) {
+        if (ObjectUtils.isEmpty(dto.getClassId())) {
             //根据当前班主任用户查出所管理的班级Id
             LambdaQueryWrapper<BaseClass> queryWrapperClassId = new LambdaQueryWrapper<>();
             queryWrapperClassId
                     .eq(BaseClass::getTeacherId, StpUtil.getLoginIdAsLong())
                     .eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode())
+                    .last("limit 1")
             ;
-            List<BaseClass> baseClassList = baseClassService.list(queryWrapperClassId);
-            if (ObjectUtils.isEmpty(baseClassList)) {
+            BaseClass baseClasse = baseClassService.getOne(queryWrapperClassId);
+            if (ObjectUtils.isEmpty(baseClasse)) {
                 return null;
             }
 
-            List<Long> classIdList = new ArrayList<>();
-            for (BaseClass baseClass : baseClassList) {
-                classIdList.add(baseClass.getId());
-            }
-
-            dto.setClassIdList(classIdList);
+            dto.setClassId(baseClasse.getId());
         }
 
 //        // 获取当前班级采用班级申领的所有教材