3.0.1-同步云阅卷bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/ExamPaperStructureStatusEnum.java

@@ -11,7 +11,7 @@ import java.util.List;
 public enum ExamPaperStructureStatusEnum {
 
     INIT("未开始"),
-    SUBJECTIVE_FINISH("试卷结构同步成功"),
+    SUBJECTIVE_FINISH("主观题结构同步成功"),
     GROUP_FINISH("分组同步成功"),
     FINISH("绑定评卷员同步成功，结束");
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TeachCourseService.java

@@ -52,4 +52,6 @@ public interface TeachCourseService extends IService<TeachCourse> {
      * @return 删除结果
      */
     Boolean deleteTeachCourseBatch(List<Long> idList);
+
+    List<TeachCourse> listBySchoolIdAndBasicCourseId(Long schoolId, List<Long> basicCourseIds);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamPaperStructureServiceImpl.java

@@ -201,7 +201,7 @@ public class ExamPaperStructureServiceImpl extends ServiceImpl<ExamPaperStructur
     @Transactional
     @Override
     public ExamPaperStructure uploadAnswer(String id, String md5, MultipartFile file) {
-        if (id == null) {
+        if (id == null || "null".equals(id)) {
             throw ExceptionResultEnum.ERROR.exception("请先设置试卷结构和分组");
         }
         ExamPaperStructure examPaperStructure = this.getById(id);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachCourseServiceImpl.java

@@ -122,4 +122,11 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
         }
         return this.removeByIds(idList);
     }
+
+    @Override
+    public List<TeachCourse> listBySchoolIdAndBasicCourseId(Long schoolId, List<Long> basicCourseIds) {
+        QueryWrapper<TeachCourse> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(TeachCourse::getSchoolId, schoolId).in(TeachCourse::getBasicCourseId, basicCourseIds);
+        return this.baseMapper.selectList(queryWrapper);
+    }
 }

distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -10,6 +10,8 @@ import com.qmth.distributed.print.business.bean.result.DictionaryResult;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.entity.ExamPrintPlan;
 import com.qmth.distributed.print.business.entity.TBSyncTask;
+import com.qmth.distributed.print.business.entity.TeachClazz;
+import com.qmth.distributed.print.business.entity.TeachCourse;
 import com.qmth.distributed.print.business.enums.DictionaryEnum;
 import com.qmth.distributed.print.business.enums.LoginTypeEnum;
 import com.qmth.distributed.print.business.service.*;
@@ -48,7 +50,6 @@ import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -96,6 +97,12 @@ public class SysController {
     @Resource
     BasicClazzService basicClazzService;
 
+    @Resource
+    TeachClazzService teachClazzService;
+
+    @Resource
+    TeachCourseService teachCourseService;
+
     @Resource
     BasicStudentService basicStudentService;
 
@@ -658,14 +665,40 @@ public class SysController {
                 if (SystemConstant.longNotNull(SystemConstant.convertIdToLong(majorId))) {
                     clazzQueryWrapper.lambda().eq(BasicClazz::getMajorId, majorId);
                 }
+                // 基础班
                 List<BasicClazz> basicClazzList = basicClazzService.list(clazzQueryWrapper);
-                dictionaryResultList = basicClazzList.stream().map(e -> {
+                List<DictionaryResult> resultBasicClazzList = basicClazzList.stream().map(e -> {
                     DictionaryResult dictionaryResult = new DictionaryResult();
                     dictionaryResult.setId(e.getId());
                     dictionaryResult.setCode(e.getClazzCode());
                     dictionaryResult.setName(e.getClazzName());
                     return dictionaryResult;
                 }).collect(Collectors.toList());
+
+                if (resultBasicClazzList.size() > 0) {
+                    dictionaryResultList.addAll(resultBasicClazzList);
+
+                    List<Long> basicCourseIds = resultBasicClazzList.stream().map(DictionaryResult::getId).collect(Collectors.toList());
+                    List<TeachCourse> teachCourses = teachCourseService.listBySchoolIdAndBasicCourseId(schoolId, basicCourseIds);
+                    if (teachCourses != null && teachCourses.size() > 0) {
+                        List<Long> teachCourseIds = teachCourses.stream().map(TeachCourse::getId).collect(Collectors.toList());
+                        // 教学班
+                        QueryWrapper<TeachClazz> teachClazzQueryWrapper = new QueryWrapper<>();
+                        teachClazzQueryWrapper.lambda().in(TeachClazz::getTeachCourseId, teachCourseIds);
+                        List<TeachClazz> teachClazzList = teachClazzService.list(teachClazzQueryWrapper);
+                        List<DictionaryResult> resultTeachClazzList = teachClazzList.stream().map(e -> {
+                            DictionaryResult dictionaryResult = new DictionaryResult();
+                            dictionaryResult.setId(e.getId());
+                            dictionaryResult.setCode(e.getTeachClazzCode());
+                            dictionaryResult.setName(e.getTeachClazzName());
+                            return dictionaryResult;
+                        }).collect(Collectors.toList());
+
+                        if (resultTeachClazzList.size() > 0) {
+                            dictionaryResultList.addAll(resultTeachClazzList);
+                        }
+                    }
+                }
                 break;
             case STUDENT:
                 QueryWrapper<BasicStudent> studentQueryWrapper = new QueryWrapper<>();