Merge remote-tracking branch 'origin/dev_v3.4.0' into dev_v3.4.0

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

@@ -466,13 +466,13 @@ public class GradeBatchServiceImpl extends ServiceImpl<GradeBatchMapper, GradeBa
             } else {
                 //修改
                 sysUser = sysUserList.get(0);
-                Long orgId = sysUser.getOrgId();
-                SysOrg userSecondaryOrg = sysOrgService.findCollegeLevelOrgByOrgId(orgId);
-                Long userSecondaryOrgId = userSecondaryOrg.getId();
-                if (!courseSecondaryOrgId.equals(userSecondaryOrgId)) {
-                    throw ExceptionResultEnum.ERROR.exception(
-                            "导入的excel中，工号为【" + key[0] + "】的用户所在学院为【" + userSecondaryOrg.getName() + "】，和课程所在学院【" + sysOrgService.getById(courseSecondaryOrgId).getName() + "】不一致");
-                }
+//                Long orgId = sysUser.getOrgId();
+//                SysOrg userSecondaryOrg = sysOrgService.findCollegeLevelOrgByOrgId(orgId);
+//                Long userSecondaryOrgId = userSecondaryOrg.getId();
+//                if (!courseSecondaryOrgId.equals(userSecondaryOrgId)) {
+//                    throw ExceptionResultEnum.ERROR.exception(
+//                            "导入的excel中，工号为【" + key[0] + "】的用户所在学院为【" + userSecondaryOrg.getName() + "】，和课程所在学院【" + sysOrgService.getById(courseSecondaryOrgId).getName() + "】不一致");
+//                }
                 String dbRealName = sysUser.getRealName();
                 if (!dbRealName.equals(key[1])) {
                     throw ExceptionResultEnum.ERROR.exception(

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

@@ -1,7 +1,5 @@
 package com.qmth.distributed.print.business.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,7 +15,6 @@ import com.qmth.teachcloud.mark.bean.student.MarkStudentQuery;
 import com.qmth.teachcloud.mark.dto.mark.MarkStudentVo;
 import com.qmth.teachcloud.mark.dto.mark.ScoreItem;
 import com.qmth.teachcloud.mark.entity.MarkPaper;
-import com.qmth.teachcloud.mark.entity.MarkStudent;
 import com.qmth.teachcloud.mark.service.MarkPaperService;
 import com.qmth.teachcloud.mark.service.MarkQuestionService;
 import com.qmth.teachcloud.mark.service.MarkStudentService;
@@ -228,12 +225,12 @@ public class OpenApiServiceImpl implements OpenApiService {
             examStudentScore.setPaperType(paperType);
             examStudentScore.setCollege(e.getCollegeName());
             examStudentScore.setMajor(SystemConstant.strNotNull(e.getMajorName()) ? e.getMajorName() : "未知专业");
-            examStudentScore.setClassName(SystemConstant.strNotNull(e.getClassName()) ? e.getClassName() : "未知班级");
+            examStudentScore.setClassName(SystemConstant.strNotNull(e.getTeachClassName()) ? e.getTeachClassName() : "未知班级");
 
             List<GradeBatchStudentClazz> gradeBatchStudentClasses = gradeBatchStudentClazzList.isEmpty() ?
                     null :
                     gradeBatchStudentClazzList.stream()
-                            .filter(s -> s.getClazzName().equals(e.getClassName()) && s.getPaperNumber().equals(examStudentScore.getPaperNumber()) && s.getPaperType()
+                            .filter(s -> s.getClazzName().equals(e.getTeachClassName()) && s.getPaperNumber().equals(examStudentScore.getPaperNumber()) && s.getPaperType()
                                     .equals(examStudentScore.getPaperType())).collect(Collectors.toList());
 
             GradeBatchStudentClazz gradeBatchStudentClazz = gradeBatchStudentClasses == null || gradeBatchStudentClasses.isEmpty() ?
@@ -241,7 +238,7 @@ public class OpenApiServiceImpl implements OpenApiService {
                     gradeBatchStudentClasses.get(0);
             if (gradeBatchStudentClazz == null) {
                 throw ExceptionResultEnum.ERROR.exception(
-                        String.format("科目[%s]，试卷编号[%s]，班级[%s]未导入任课老师", e.getCourseName(), e.getPaperNumber(), e.getClassName()));
+                        String.format("科目[%s]，试卷编号[%s]，班级[%s]未导入任课老师", e.getCourseName(), e.getPaperNumber(), e.getTeachClassName()));
             }
 
             examStudentScore.setTeacherName(gradeBatchStudentClazz.getTeacherName());

teachcloud-mark/src/main/resources/mapper/MarkStudentMapper.xml

@@ -837,12 +837,14 @@
         ms.*,
         ms.is_upload upload,
         ms.is_absent absent,
+        ms.is_breach breach,
+        ms.is_manual_absent manualAbsent,
         bes.student_name,
         bc.code courseCode,
         bc.name courseName,
         bes.college_name,
         bes.major_name,
-        bes.teach_class_name,
+        btc.clazz_name AS teachClassName,
         bes.class_name,
         su.real_name teacher,
         bes.teacher_id
@@ -854,6 +856,8 @@
         basic_course bc ON ms.course_id = bc.id
         LEFT JOIN
         sys_user su ON bes.teacher_id = su.id
+        LEFT JOIN
+        basic_teach_clazz btc ON bes.clazz_id = btc.id
         <where>
             <if test="markStudentQuery.id != null">
                 and ms.id = #{markStudentQuery.id}

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TBExamStudentServiceImpl.java

@@ -128,12 +128,13 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     public List<TBExamStudentResult> selectInspectCollegeList(Long schoolId, Long examId, String courseCode, Boolean absent, Boolean current, PublishStatusEnum status) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         AuthBean authBean = commonCacheService.userAuthCache(sysUser.getId());
+        BasicCourse basicCourse = basicCourseService.findByCourseCode(courseCode, schoolId);
         if (Objects.nonNull(authBean) && Objects.nonNull(authBean.getRoleList()) && authBean.getRoleList().get(0).getType() == RoleTypeEnum.TEACHER) {
             List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
             if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {
                 return tbExamStudentMapper.selectInspectCollegeListByTeacher(schoolId, examId, courseCode, collegeIds, sysUser.getId(), absent, current, Objects.nonNull(status) ? status.name() : null);
             } else {
-                return tbExamStudentMapper.selectInspectCollegeListByTeacher(schoolId, examId, courseCode, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, sysUser.getId(), absent, current, Objects.nonNull(status) ? status.name() : null);
+                return tbExamStudentMapper.selectInspectCollegeListByTeacher(schoolId, examId, courseCode, Objects.nonNull(basicCourse.getTeachingRoomId()) ? Arrays.asList(sysUser.getOrgId()) : null, sysUser.getId(), absent, current, Objects.nonNull(status) ? status.name() : null);
             }
         }
         return tbExamStudentMapper.selectInspectCollegeList(schoolId, examId, courseCode, absent, current, Objects.nonNull(status) ? status.name() : null);