Merge remote-tracking branch 'origin/dev_v2.2.1' into dev_v2.2.1

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.distributed.print.business.bean.dto.ExamStudentCourseDto;
 import com.qmth.distributed.print.business.bean.dto.SyncExamStudentDto;
 import com.qmth.distributed.print.business.entity.ExamStudent;
+import com.qmth.teachcloud.common.entity.SysOrg;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -35,4 +36,6 @@ public interface ExamStudentMapper extends BaseMapper<ExamStudent> {
     void insertBatch(@Param("examStudents") List<ExamStudent> examStudents);
 
     List<ExamStudent> listExamStudentBySchoolIdAndClazzId(@Param("schoolId") Long schoolId, @Param("classId") String classId);
+
+    SysOrg getSysOrgByBelongOrgId(String studentCode);
 }

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

@@ -5,6 +5,7 @@ import com.qmth.distributed.print.business.bean.dto.ExamStudentCourseDto;
 import com.qmth.distributed.print.business.bean.dto.SyncExamStudentDto;
 import com.qmth.distributed.print.business.entity.ExamDetailCourse;
 import com.qmth.distributed.print.business.entity.ExamStudent;
+import com.qmth.teachcloud.common.entity.SysOrg;
 
 import java.util.List;
 import java.util.Map;
@@ -39,4 +40,6 @@ public interface ExamStudentService extends IService<ExamStudent> {
     void insertBatch(List<ExamStudent> examStudents);
 
     List<ExamStudent> listExamStudentBySchoolIdAndClazzId(Long schoolId, String classId);
+
+    SysOrg getSysOrgByBelongOrgId(String studentCode);
 }

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

@@ -19,6 +19,7 @@ import com.qmth.teachcloud.common.bean.dto.QuestionDTO;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.entity.SysConfig;
+import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.SyncFileTypeEnum;
@@ -443,7 +444,8 @@ public class DataSyncServiceImpl implements DataSyncService {
                 String examNumber = examStudent.getTicketNumber();
                 String studentCode = examStudent.getStudentCode();
                 String name = examStudent.getStudentName();
-                String college = "无";
+                SysOrg sysOrg = examStudentService.getSysOrgByBelongOrgId(studentCode);
+                String college = Objects.nonNull(sysOrg) && StringUtils.isNotBlank(sysOrg.getName()) ? sysOrg.getName() : "无";
                 String className = StringUtils.isBlank(examStudent.getClazzName()) ? getClassName(examStudent.getExtendFields()) : examStudent.getClazzName();
                 String teacher = "无";
                 String subjectCode = examStudent.getPaperNumber() + examStudent.getPaperType(); // 取试卷编号

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

@@ -10,6 +10,7 @@ import com.qmth.distributed.print.business.entity.ExamDetailCourse;
 import com.qmth.distributed.print.business.entity.ExamStudent;
 import com.qmth.distributed.print.business.mapper.ExamStudentMapper;
 import com.qmth.distributed.print.business.service.ExamStudentService;
+import com.qmth.teachcloud.common.entity.SysOrg;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -89,4 +90,9 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamS
     public List<ExamStudent> listExamStudentBySchoolIdAndClazzId(Long schoolId, String classId) {
         return this.baseMapper.listExamStudentBySchoolIdAndClazzId(schoolId, classId);
     }
+
+    @Override
+    public SysOrg getSysOrgByBelongOrgId(String studentCode) {
+        return this.baseMapper.getSysOrgByBelongOrgId(studentCode);
+    }
 }

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

@@ -128,5 +128,15 @@
         where bs.school_id = #{schoolId}
             and bs.clazz_id = #{classId}
     </select>
+    <select id="getSysOrgByBelongOrgId" resultType="com.qmth.teachcloud.common.entity.SysOrg">
+        SELECT
+            so.id, so.name
+        FROM
+            basic_student bs
+                LEFT JOIN
+            sys_org so ON bs.belong_org_id = so.id
+        WHERE
+            bs.student_code = #{studentCode}
+    </select>
 
 </mapper>

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

@@ -106,7 +106,6 @@
                         and a.status = #{status}
                     </otherwise>
                 </choose>
-                and a.status = #{status}
             </if>
             <if test="cardRuleId != null and cardRuleId != ''">
                 and a.card_rule_id = #{cardRuleId}