排课基础数据推送调整

src/main/java/com/xjrsoft/module/schedule/util/DataUtil.java

@@ -375,13 +375,13 @@ public class DataUtil {
             //生成签名
             String sign = ScheduleUtil.createSign(timestamp);
             paramJson.addProperty("period", period);
-            paramJson.addProperty("startDate", sdf.format(semester.getStartDate()));
-            paramJson.addProperty("endDate", sdf.format(semester.getEndDate()));
+            paramJson.addProperty("startDate", sdf.format(semester.getTeachingStart()));
+            paramJson.addProperty("endDate", sdf.format(semester.getTeachingEnd()));
             paramJson.addProperty("extendId", semester.getId().toString());
 
-            if(semester.getStartDate() != null && semester.getEndDate() != null && semester.getEndDate().getTime() > timestamp && semester.getStartDate().getTime() < timestamp){
+            if(semester.getStartDate() != null && semester.getTeachingStart() != null && semester.getTeachingEnd().getTime() > timestamp && semester.getTeachingStart().getTime() < timestamp){
                 paramJson.addProperty("isCurrent", Boolean.TRUE);
-            }else if(semester.getStartDate() != null && semester.getEndDate() != null && semester.getEndDate().getTime() > timestamp && semester.getStartDate().getTime() > timestamp){
+            }else if(semester.getStartDate() != null && semester.getTeachingStart() != null && semester.getTeachingEnd().getTime() > timestamp && semester.getTeachingStart().getTime() > timestamp){
                 paramJson.addProperty("isCurrent", Boolean.TRUE);
             }else{
                 paramJson.addProperty("isCurrent", Boolean.FALSE);

src/test/java/com/xjrsoft/module/job/JianyuekbBaseDataTaskTest.java

@@ -95,24 +95,8 @@ class JianyuekbBaseDataTaskTest {
             //查询校区
             String tableName = "xjr_department";
 
-            //推送年级
-            JsonArray schoolDistrictData = dataUtil.getSchoolDistrictData();
-            tableName = "base_grade";
-            Map<String, String> gradeMap = dataMap.get(tableName);
-            //推送教职工
-            tableName = "base_teacher";
-            Map<String, String> teacherMap = dataMap.get(tableName);
-            //推送教室
-            tableName = "base_classroom";
-            Map<String, String> classroomMap = dataMap.get(tableName);
-            //推送行政班，先查询当前学期id
-            String currenSemeter = dataUtil.getCurrenSemeter();
-            tableName = "base_class";
-            sql = "SELECT * FROM base_class WHERE delete_mark = 0" +
-                " and id not in (SELECT source_id FROM jianyue_data WHERE table_name = 'base_class' AND source_id IS NOT NULL)";
-
-            tableName = "base_class";
-            dataUtil.insertClass(tableName, gradeMap, teacherMap, currenSemeter, dataMap.get(tableName), classroomMap);
+            tableName = "base_semester";
+            dataUtil.insertSemester(tableName, dataMap.get(tableName));
         } catch (Exception e) {
         }
     }