fid bug

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicExamStudentMapper.java

@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.distributed.print.business.bean.BasicExamStudentQuery;
+import com.qmth.distributed.print.business.bean.dto.ExamStudentDto;
 import com.qmth.distributed.print.business.bean.result.BasicExamStudentResult;
-import com.qmth.teachcloud.common.entity.BasicExamStudent;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
+import com.qmth.teachcloud.common.entity.BasicExamStudent;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -24,7 +25,7 @@ public interface BasicExamStudentMapper extends BaseMapper<BasicExamStudent> {
     IPage<BasicExamStudentResult> findBasicExamStudentPage(@Param("iPage") Page<BasicExamStudentResult> iPage,
                                                            @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId,
                                                            @Param("courseId") Long courseId, @Param("teacher") String teacher, @Param("college") String college,
-                                                           @Param("major") String major, @Param("teachClassName") String teachClassName,@Param("className") String className,
+                                                           @Param("major") String major, @Param("teachClassName") String teachClassName, @Param("className") String className,
                                                            @Param("examStudentInfo") String examStudentInfo, @Param("dpr") DataPermissionRule dpr);
 
     /**
@@ -44,4 +45,14 @@ public interface BasicExamStudentMapper extends BaseMapper<BasicExamStudent> {
     List<String> findBoundBasicExamStudentNames(@Param("idList") List<Long> idList);
 
     List<BasicExamStudentResult> listByParams(@Param("query") BasicExamStudentQuery query);
+
+    /**
+     * 查询班级和老师信息
+     *
+     * @param examId
+     * @param courseId
+     * @param paperNumber
+     * @return
+     */
+    ExamStudentDto queryExamStudent(@Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.BasicExamStudentQuery;
 import com.qmth.distributed.print.business.bean.dto.DeleteBasicExamStudentStatusDto;
+import com.qmth.distributed.print.business.bean.dto.ExamStudentDto;
 import com.qmth.distributed.print.business.bean.params.BasicExamStudentParam;
 import com.qmth.distributed.print.business.bean.result.BasicExamStudentResult;
 import com.qmth.distributed.print.business.entity.ExamStudent;
@@ -80,4 +81,14 @@ public interface BasicExamStudentService extends IService<BasicExamStudent> {
     void updateMarkData(Long examId, List<BasicExamStudent> basicExamStudentList, List<String> oldPaperNumberList, Long createId);
 
     List<DeleteBasicExamStudentStatusDto> getStudentMarkStatus(List<Long> idList);
+
+    /**
+     * 查询班级和老师信息
+     *
+     * @param examId
+     * @param courseId
+     * @param paperNumber
+     * @return
+     */
+    ExamStudentDto queryExamStudent(Long examId, Long courseId, String paperNumber);
 }

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.BasicExamStudentQuery;
 import com.qmth.distributed.print.business.bean.dto.BasicExamStudentDto;
 import com.qmth.distributed.print.business.bean.dto.DeleteBasicExamStudentStatusDto;
+import com.qmth.distributed.print.business.bean.dto.ExamStudentDto;
 import com.qmth.distributed.print.business.bean.params.BasicExamStudentParam;
 import com.qmth.distributed.print.business.bean.result.BasicExamStudentResult;
 import com.qmth.distributed.print.business.entity.BasicExamRule;
@@ -26,7 +27,6 @@ import com.qmth.teachcloud.common.enums.BasicExamStudentStatusEnum;
 import com.qmth.teachcloud.common.enums.EnumResult;
 import com.qmth.teachcloud.common.enums.ExamModelEnum;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.mark.MarkPaperStatus;
 import com.qmth.teachcloud.common.service.*;
 import com.qmth.teachcloud.common.util.ConvertUtil;
 import com.qmth.teachcloud.common.util.ExcelUtil;
@@ -473,4 +473,17 @@ public class BasicExamStudentServiceImpl extends ServiceImpl<BasicExamStudentMap
         }
         return list;
     }
+
+    /**
+     * 查询班级和老师信息
+     *
+     * @param examId
+     * @param courseId
+     * @param paperNumber
+     * @return
+     */
+    @Override
+    public ExamStudentDto queryExamStudent(Long examId, Long courseId, String paperNumber) {
+        return this.baseMapper.queryExamStudent(examId, courseId, paperNumber);
+    }
 }

distributed-print-business/src/main/resources/mapper/BasicExamStudentMapper.xml

@@ -217,4 +217,23 @@
         </where>
         ORDER BY stu.student_code
     </select>
+
+    <select id="queryExamStudent" resultType="com.qmth.distributed.print.business.bean.dto.ExamStudentDto">
+        select
+        GROUP_CONCAT(distinct bes.teach_class_name) as clazzNames,
+        GROUP_CONCAT(distinct su.real_name) as teacherNames
+        from basic_exam_student bes
+        left join sys_user su on su.id = bes.teacher_id
+        <where>
+            <if test="examId != null and examId != ''">
+                AND bes.exam_id = #{examId}
+            </if>
+            <if test="courseId != null and courseId != ''">
+                AND bes.course_id = #{courseId}
+            </if>
+            <if test="paperNumber != null and paperNumber != ''">
+                AND bes.paper_number = #{paperNumber}
+            </if>
+        </where>
+    </select>
 </mapper>

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/TRBasicInfoServiceImpl.java

@@ -10,7 +10,7 @@ import com.deepoove.poi.data.style.ParagraphStyle;
 import com.deepoove.poi.data.style.RowStyle;
 import com.google.gson.reflect.TypeToken;
 import com.qmth.distributed.print.business.bean.dto.ExamStudentDto;
-import com.qmth.distributed.print.business.service.ExamStudentService;
+import com.qmth.distributed.print.business.service.BasicExamStudentService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
@@ -76,9 +76,6 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
     @Resource
     ObeCourseWeightService obeCourseWeightService;
 
-    @Resource
-    ExamStudentService examStudentService;
-
     @Resource
     BasicCourseService basicCourseService;
 
@@ -94,6 +91,9 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
     @Resource
     SysOrgService sysOrgService;
 
+    @Resource
+    BasicExamStudentService basicExamStudentService;
+
     protected static final String tbBgColor = "F2F2F2";
     protected static final String tbPercentWidth = "100%";
     protected static final String[] scoreTitles = new String[]{"100-90", "89-80", "79-70", "69-60", "<60"};
@@ -447,8 +447,9 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
 
         String teachingObject = Objects.nonNull(trBasicInfo) ? trBasicInfo.getTeachingObject() : null, teacher = Objects.nonNull(trBasicInfo) ? trBasicInfo.getTeacher() : null;
         if (Objects.nonNull(markPaper.getPaperNumber())) {
-            ExamStudentDto examStudentDto = examStudentService.queryExamStudent(markPaper.getExamId(), markPaper.getCourseCode(), markPaper.getPaperNumber());
+            ExamStudentDto examStudentDto = basicExamStudentService.queryExamStudent(markPaper.getExamId(), courseId, markPaper.getPaperNumber());
             teacher = Objects.nonNull(examStudentDto) ? examStudentDto.getTeacherNames() : null;
+            teachingObject = Objects.nonNull(examStudentDto) ? examStudentDto.getClazzNames() : null;
         }
 
         ObeCultureProgram obeCultureProgram = obeCultureProgramService.getById(obeCourseOutline.getCultureProgramId());