3.4.6 20250612 bug修复(数据同步bug)

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

@@ -678,14 +678,14 @@ public class BasicExamStudentServiceImpl extends ServiceImpl<BasicExamStudentMap
                         }
                     } else {
                         List<BasicCourse> basicCourseList = basicCourseService.listBySchoolIdAndCode(schoolId, tSyncDataStudent.getCourseCode());
-                        if(CollectionUtils.isEmpty(basicCourseList)){
+                        if (CollectionUtils.isEmpty(basicCourseList)) {
                             throw ExceptionResultEnum.ERROR.exception("课程代码[" + tSyncDataStudent.getCourseCode() + "]不存在");
-                        } else if(basicCourseList.size() == 1){
+                        } else if (basicCourseList.size() == 1) {
                             BasicCourse basicCourse = basicCourseList.get(0);
                             courseId = basicCourse.getId();
                             basicCourseIdMap.put(key, basicCourse.getId());
-                        }else {
-                            throw ExceptionResultEnum.ERROR.exception("开课学院[" + tSyncDataStudent.getCourseCollegeName() + "]必填");
+                        } else {
+                            throw ExceptionResultEnum.ERROR.exception("课程代码[" + tSyncDataStudent.getCourseCode() + "]存在多个值，开课学院[" + tSyncDataStudent.getCourseCollegeName() + "]必填");
                         }
                     }
                 } else {
@@ -732,7 +732,7 @@ public class BasicExamStudentServiceImpl extends ServiceImpl<BasicExamStudentMap
 
                 if (StringUtils.isNotBlank(tSyncDataStudent.getPaperNumber())) {
                     if (paperNumberCourseIdMap.containsKey(tSyncDataStudent.getPaperNumber())) {
-                        if (!paperNumberCourseIdMap.get(basicExamStudent.getPaperNumber()).equals(basicExamStudent.getCourseId())) {
+                        if (!paperNumberCourseIdMap.get(tSyncDataStudent.getPaperNumber()).equals(basicExamStudent.getCourseId())) {
                             throw ExceptionResultEnum.ERROR.exception("试卷编号[" + basicExamStudent.getPaperNumber() + "]不能绑定多个课程");
                         }
                     } else {

distributed-print/install/mysql/init/teachcloud_db.sql

@@ -255,7 +255,7 @@ CREATE TABLE IF NOT EXISTS `basic_message`
     `org_id`           bigint        DEFAULT NULL COMMENT '机构id',
     `user_id`          bigint        DEFAULT NULL COMMENT '消息接收人用户',
     `user_name`        varchar(100)  DEFAULT NULL COMMENT '用户名称',
-    `mobile_number`    varchar(11) NOT NULL COMMENT '电话号码',
+    `mobile_number`    varchar(11) NULL COMMENT '电话号码',
     `paper_number`     varchar(50)   DEFAULT NULL COMMENT '试卷编号',
     `course_code`      varchar(50)   DEFAULT NULL COMMENT '课程代码',
     `message_type`     varchar(45)   DEFAULT NULL COMMENT '消息类型',

distributed-print/src/main/resources/upgrade/3.4.6/3.4.6-upgrade.sql

@@ -18,3 +18,6 @@ UPDATE `sys_config` SET `config_value` = '[{\"name\":\"A3\",\"size\":\"297*420\"
 UPDATE `sys_config` SET `config_value` = '[{\"name\":\"A3\",\"size\":\"420*297\"}, {\"name\":\"8K\",\"size\":\"390*270\"}, {\"name\":\"A4\",\"size\":\"210*297\"}, {\"name\":\"B4\",\"size\":\"353*250\"}]' WHERE (`id` = '43');
 
 UPDATE `sys_privilege` SET `related` = '67,68' WHERE (`id` = '273');
+
+ALTER TABLE `basic_message` CHANGE COLUMN `mobile_number` `mobile_number` VARCHAR(11) NULL COMMENT '电话号码' ;
+

teachcloud-data/src/main/java/com/qmth/teachcloud/data/DataUtil.java

@@ -121,8 +121,8 @@ public class DataUtil {
             List<T> list;
             int pageNumber = 0;
             do {
-                int offset = pageNumber * PAGE_SIZE + PAGE_SIZE;
-                list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(tClass), pageNumber, offset);
+                int offset = pageNumber * PAGE_SIZE ;
+                list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(tClass), offset, PAGE_SIZE);
                 if (CollectionUtils.isNotEmpty(list)) {
                     listAll.addAll(list);
                     pageNumber++;