fix

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

@@ -903,6 +903,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         List<UserBankRecordVo> recordList = iUserBankRecordService.queryList(recordQueryBo);
         //录入学时记录
         UserPeriodExportV2Vo userPeriodExportVo = new UserPeriodExportV2Vo();
+        userPeriodExportVo.setId(index);
+        userPeriodExportVo.setSectionName(sectionName);
         List<UserPeriodItemExportVo> studyList = new ArrayList<>();
         for(UserBankRecordVo vo : recordList){
             UserPeriodItemExportVo exportVo = new UserPeriodItemExportVo();
@@ -1681,7 +1683,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     if (classPeriodChapterVo.getType() == 2) {
                         chapterName = classPeriodChapterVo.getTypeName();
                         List<ClassPeriodSectionVo> classPeriodSectionVos = baseMapper.listPeriodSection(classPeriodChapterVo.getId(), goodsId, classPeriodVo.getCourseId(), userId);
-                        classPeriodSectionVos.addAll(baseMapper.listperiodExam(classPeriodChapterVo.getId(), goodsId, classPeriodVo.getCourseId(), userId, classPeriodVo.getId()));
+                        List<ClassPeriodSectionVo> examList = baseMapper.listperiodExam(classPeriodChapterVo.getId(), goodsId, classPeriodVo.getCourseId(), userId, classPeriodVo.getId());
+                        if(examList.size()>0){
+                            classPeriodSectionVos.addAll(examList);
+                        }
                         for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos) {
                             i++;
                             if (classPeriodSectionVo.getType() == 3) {

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -1273,6 +1273,8 @@
         <if test="chapterId != null and chapterId !='' ">
             AND ccs.chapter_id = #{chapterId}
         </if>
+        ORDER BY
+        ccs.sort
     </select>