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

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TSyncExamStudentScore.java

@@ -151,7 +151,7 @@ public class TSyncExamStudentScore implements Serializable {
         this.subjectName = (String) map.get("subjectName");
         this.paperType = (String) map.get("paperType");
         this.college = (String) map.get("college");
-        this.clazzName = (String) map.get("className");
+        this.clazzName = (String) map.get("clazzName");
         this.teacher = (String) map.get("teacher");
         this.status = (Integer) map.get("status");
         JSONArray jsonArray = (JSONArray) map.get("sheetUrls");

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

@@ -86,32 +86,31 @@ public class PushLogicServiceImpl implements PushLogicService {
                             List<Map> students = stmmsUtils.getStudentScore(schoolId, examId, null, null, null, null, null, null, null, true, i, pageSize);
                             for (Map student : students) {
                                 try {
-                                    Long orgId = null, clazzId = null, majorId = null;
+                                    Long orgId = null, clazzId = null;
+                                    String clazzName = "";
+                                    String majorName = "";
                                     if (Objects.nonNull(student.get("studentCode")) && !Objects.equals("无", student.get("studentCode"))) {
                                         String studentCode = String.valueOf(student.get("studentCode"));
                                         String subjectCode = String.valueOf(student.get("subjectCode"));
                                         String examNumber = String.valueOf(student.get("examNumber"));
                                         Long printPlanId = Long.valueOf(student.get("examCode").toString()); // 计划ID
 
+                                        // 分布式印刷系统内部考生信息
                                         List<Map> studentInfos = examStudentService.listStudentScoreSync(schoolId, studentCode, examNumber, subjectCode, printPlanId);
                                         if (studentInfos == null || studentInfos.size() == 0) {
                                             throw ExceptionResultEnum.ERROR.exception("未找到此考生信息");
                                         }
-                                        Map stuMap = studentInfos.get(0);
+                                        Map dpsPrintStuMap = studentInfos.get(0);
 
-//                                        clazzId = stuMap.get("clazzId") == null || "".equals(stuMap.get("clazzId")) ? null : Long.parseLong(String.valueOf(stuMap.get("clazzId")));
-//                                        if (clazzId != null) {
-//                                            TeachClazz teachClazz = teachClazzService.getById(clazzId);
-//                                            if (teachClazz == null) {
-//                                                BasicClazz basicClazz = basicClazzService.getById(clazzId);
-//                                                if (Objects.nonNull(basicClazz)) {
-//                                                    majorId = basicClazz.getMajorId();
-//                                                    BasicMajor basicMajor = basicMajorService.getById(majorId);
-//                                                    orgId = basicMajor.getBelongOrgId();
-//                                                }
-//                                            }
-//                                        }
+                                        // 组装本系统内考生信息
+                                        clazzId = dpsPrintStuMap.get("clazzId") == null || "".equals(dpsPrintStuMap.get("clazzId")) ? null : Long.parseLong(String.valueOf(dpsPrintStuMap.get("clazzId")));
+                                        clazzName = String.valueOf(dpsPrintStuMap.get("clazzName"));
+                                        majorName = String.valueOf(dpsPrintStuMap.get("majorName"));
+                                        student.put("clazzId",clazzId);
+                                        student.put("clazzName",clazzName);
+                                        student.put("majorName",majorName);
                                     }
+
                                     student.put(SystemConstant.SCHOOL_ID, schoolId);
                                     student.put("semesterId", k);
                                     student.put("orgId", orgId);

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

@@ -13,12 +13,9 @@
             tsess.name,
             tsess.student_code as studentCode,
             tsess.exam_number as examNumber,
-            so.id as orgId,
-            so.name as orgName,
-            bm.id as majorId,
-            bm.name as majorName,
-            bc.id as clazz_id,
-            bc.clazz_name as clazzName,
+            tsess.major_name as majorName,
+            tsess.college as orgName,
+            tsess.clazz_name as clazzName,
             concat(edc.paper_number,edc.paper_type) as courseCode,
             edc.course_name as courseName,
             tsess.total_score as totalScore,
@@ -35,15 +32,8 @@
             bs.id = tsess.semester_id
         join basic_student bs2 on
             bs2.school_id = tsess.school_id and bs2.student_code = tsess.student_code
-        join (select id,clazz_name from basic_clazz where school_id = #{schoolId}
-                union all select id,teach_clazz_name clazz_name from teach_clazz where school_id = #{schoolId} ) bc on
-            bc.id = tsess.clazz_id
         join exam_student es on
             es.school_id = tsess.school_id and es.ticket_number = tsess.exam_number and es.student_code = tsess.student_code
-        left join basic_major bm on
-            bm.id = tsess.major_id
-        left join sys_org so on
-            so.id = tsess.org_id
         join exam_detail_course edc on
             edc.id = es.exam_detail_course_id
         join exam_task et on