submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseSubjectMapper.java

@@ -38,4 +38,7 @@ public interface CourseSubjectMapper extends BaseMapper<CourseSubject> {
 
     @InterceptorIgnore(tenantLine = "true")
     List<CourseSubject> listByIdsTenant(ClassGradeListBo bgListBo);
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<CourseSubject> getListByIDs(@Param("ids") List<Long> ids);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseSubjectService.java

@@ -60,4 +60,5 @@ public interface ICourseSubjectService extends IService<CourseSubject> {
 
 	List<CourseSubject> listByIdsTenant(ClassGradeListBo bgListBo);
 
+    List<CourseSubject> getListByIDs(List<Long> ids);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSubjectServiceImpl.java

@@ -195,4 +195,9 @@ public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, C
     public List<CourseSubject> listByIdsTenant(ClassGradeListBo bgListBo) {
         return baseMapper.listByIdsTenant(bgListBo);
     }
+
+    @Override
+    public List<CourseSubject> getListByIDs(List<Long> ids) {
+        return baseMapper.getListByIDs(ids);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -1054,7 +1054,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             }
             //科目名称
             if(StringUtils.isNotBlank(item.getSubjectIds())){
-                List<CourseSubject> courseSubjectList = iCourseSubjectService.listByIds(Arrays.asList(item.getSubjectIds().split(",")));
+                List<CourseSubject> courseSubjectList = iCourseSubjectService.getListByIDs(Arrays.asList(item.getSubjectIds().split(",")).stream().map(x -> Long.valueOf(x)).collect(Collectors.toList()));
                 item.setMajorName(courseSubjectList.stream().filter(x -> StringUtils.isNotBlank(x.getSubjectName())).map(CourseSubject::getSubjectName).collect(Collectors.joining(",")));
             }
         });
@@ -1173,6 +1173,9 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                     List<CourseSubject> courseSubjectList = iCourseSubjectService.listByIds(Arrays.asList(item.getSubjectIds().split(",")));
                     item.setMajorName(courseSubjectList.stream().filter(x -> StringUtils.isNotBlank(x.getSubjectName())).map(CourseSubject::getSubjectName).collect(Collectors.joining(",")));
                 }
+                if (ObjectUtils.isNull(item.getReportStatu())){
+
+                }
             });
         }
         //旧系统二建/二造班级学员信息

zhongzheng-system/src/main/resources/mapper/modules/course/CourseSubjectMapper.xml

@@ -153,4 +153,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </foreach>
         </if>
     </select>
+
+    <select id="getListByIDs" parameterType="java.lang.Long" resultType="com.zhongzheng.modules.course.domain.CourseSubject">
+        select * from course_subject where `status` = 1
+        <if test="ids != null and ids.size()!=0 ">
+            AND id in
+            <foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>