1、新生报到导出调整

2、课表数据同步逻辑调整

src/main/java/com/xjrsoft/module/job/JianyuekbScheduleTask.java

@@ -53,8 +53,8 @@ public class JianyuekbScheduleTask {
 
         //查询出传入排课系统的年级和班级
         sql = "SELECT * FROM jianyue_data WHERE source_id IS NOT NULL AND jianyue_id != ''" +
-                " and table_name = 'base_grade'" +
-                " and jianyue_id in (" + eduYearSerialNo1.toString().replace("[","").replace("]","") + ")";
+            " and table_name = 'base_grade'" +
+            " and jianyue_id in (" + eduYearSerialNo1.toString().replace("[","").replace("]","") + ")";
         List<Map<String, Object>> jianyueData = SqlRunnerAdapter.db().selectList(sql);
         Map<String, List<Long>> gradeClassMaps = new HashMap<>();//存入对应年级的所有班级id
         for (Map<String, Object> el : jianyueData) {
@@ -83,7 +83,7 @@ public class JianyuekbScheduleTask {
             String startDateStr = receiveMsg.get("start_date").toString();
             String endDateStr = receiveMsg.get("end_date").toString();
             //删除课表信息
-            String delSql = "delete from course_table where schedule_date between '" + startDateStr + "'" +
+            String delSql = "delete from course_table where schedule_date between DATE_FORMAT(NOW(), '%Y-%m-%d')" +
                     " and '" + endDateStr + "'" +
                     " and class_id in (" + gradeClassMaps.get(eduYearSerialNo).toString().replace("[","").replace("]","")+ ")";
             SqlRunnerAdapter.db().delete(delSql);

src/main/java/com/xjrsoft/module/student/controller/BaseNewStudentController.java

@@ -358,7 +358,7 @@ public class BaseNewStudentController {
     public ResponseEntity<byte[]> exportData(@Valid BaseNewStudentPageDto dto) {
         List<BaseNewStudentPageVo> reportList = baseNewStudentService.getReportList(dto);
         List<BaseNewStudentExportVo> exportVos = new ArrayList<>();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH:mm:ss");
         for (BaseNewStudentPageVo el : reportList) {
             BaseNewStudentExportVo vo = BeanUtil.toBean(el, BaseNewStudentExportVo.class);
             if(el.getIsAdjust() == 1){

src/main/resources/mapper/student/BaseNewStudentMapper.xml

@@ -227,7 +227,7 @@
         <if test="dto.isReport != null">
             AND (select count(*) from student_report_record where user_id = t1.id and base_semester_id = #{dto.baseSemesterId} and delete_mark = 0) = #{dto.isReport}
         </if>
-        <if test="dto.stduyStatus != null">
+        <if test="dto.stduyStatus != null and dto.stduyStatus != ''">
             AND t10.stduy_status = #{dto.stduyStatus}
         </if>
         <if test="dto.enrollmentPlanId != null">