wangliang 3 years ago
parent
commit
1ca4d7e27b

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

@@ -37,5 +37,5 @@ public interface ExamStudentMapper extends BaseMapper<ExamStudent> {
 
     List<ExamStudent> listExamStudentBySchoolIdAndClazzId(@Param("schoolId") Long schoolId, @Param("classId") String classId);
 
-    SysOrg getSysOrgByBelongOrgId(String studentCode);
+    SysOrg getSysOrgByBelongOrgId(@Param("studentCode") String studentCode, @Param("schoolId") Long schoolId);
 }

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

@@ -41,5 +41,5 @@ public interface ExamStudentService extends IService<ExamStudent> {
 
     List<ExamStudent> listExamStudentBySchoolIdAndClazzId(Long schoolId, String classId);
 
-    SysOrg getSysOrgByBelongOrgId(String studentCode);
+    SysOrg getSysOrgByBelongOrgId(String studentCode, Long schoolId);
 }

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

@@ -403,7 +403,7 @@ public class DataSyncServiceImpl implements DataSyncService {
             updateWrapper.lambda().set(ExamPrintPlan::getSyncStatus, syncStatus).eq(ExamPrintPlan::getId, examPrintPlan.getId());
             examPrintPlanService.update(updateWrapper);
             // 同步成功,发送短信
-            if(ExamPrintPlanSyncStatusEnum.FINISH.equals(syncStatus)) {
+            if (ExamPrintPlanSyncStatusEnum.FINISH.equals(syncStatus)) {
                 examPrintPlanService.sendNoticeUploadStructure(examPrintPlan.getId(), sysUser);
             }
         }
@@ -444,7 +444,7 @@ public class DataSyncServiceImpl implements DataSyncService {
                 String examNumber = examStudent.getTicketNumber();
                 String studentCode = examStudent.getStudentCode();
                 String name = examStudent.getStudentName();
-                SysOrg sysOrg = examStudentService.getSysOrgByBelongOrgId(studentCode);
+                SysOrg sysOrg = examStudentService.getSysOrgByBelongOrgId(studentCode, schoolId);
                 String college = Objects.nonNull(sysOrg) && StringUtils.isNotBlank(sysOrg.getName()) ? sysOrg.getName() : "无";
                 String className = StringUtils.isBlank(examStudent.getClazzName()) ? getClassName(examStudent.getExtendFields()) : examStudent.getClazzName();
                 String teacher = "无";

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

@@ -92,7 +92,7 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamS
     }
 
     @Override
-    public SysOrg getSysOrgByBelongOrgId(String studentCode) {
-        return this.baseMapper.getSysOrgByBelongOrgId(studentCode);
+    public SysOrg getSysOrgByBelongOrgId(String studentCode, Long schoolId) {
+        return this.baseMapper.getSysOrgByBelongOrgId(studentCode, schoolId);
     }
 }

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

@@ -137,6 +137,7 @@
             sys_org so ON bs.belong_org_id = so.id
         WHERE
             bs.student_code = #{studentCode}
+            and bs.school_id = #{schoolId}
     </select>
 
 </mapper>