课表调整

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

@@ -695,26 +695,26 @@ public class DataUtil {
             json.add("numberOfDay", asJsonObject.get("numberOfDay"));
             infoMap.put(numberOfDayName, json);
         }
-//        List<String> sqls = new ArrayList<>();
         int count = 1;
         for (String number : infoMap.keySet()) {
-            String substring1 = number.substring(number.length() - 1);
             JsonObject jsonObject = infoMap.get(number);
+            int timeNumber = jsonObject.get("numberOfDay").getAsInt();//节次
+            String fullName = "第" +timeNumber + "节课";
             long id = System.currentTimeMillis();
-            String fullName = "第" +substring1 + "节课";
+
             String sql = "INSERT INTO class_time(id,time_period,number,full_name,short_name,create_date,summer_start_time"
                     + ",summer_end_time,winter_start_time,winter_end_time) select " + id + String.format("%04d", count) + ","
                     + jsonObject.get("tmePeriod").getAsInt() + ","
-                    + substring1 + ","
+                    + timeNumber + ","
                     + "'" + fullName + "',"
-                    + "'" + fullName + "',now(),"
+                    + "'" + number + "',now(),"
                     + "'" + jsonObject.get("startTime").getAsString() + "',"
                     + "'" + jsonObject.get("endTime").getAsString() + "',"
                     + "'" + jsonObject.get("startTime").getAsString() + "',"
                     + "'" + jsonObject.get("endTime").getAsString() + "' FROM DUAL"
                     + " WHERE NOT EXISTS(SELECT * FROM class_time WHERE time_period = "
                     + jsonObject.get("tmePeriod").getAsInt()
-                    + " and number = " + substring1 + ")";
+                    + " and number = " + timeNumber + ")";
 //            sqls.add(sql);
             SqlRunnerAdapter.db().insert(sql);
             count ++;

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

@@ -11,6 +11,7 @@ import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
 import com.xjrsoft.module.schedule.entity.CourseReceiveMsg;
 import com.xjrsoft.module.schedule.util.DataUtil;
 import com.xjrsoft.module.schedule.util.ScheduleUtil;
+import org.camunda.bpm.engine.impl.util.JsonUtil;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -77,6 +78,19 @@ class JianyuekbScheduleTaskTest {
             SqlRunnerAdapter.db().update(updSql);
         }
         doExecute(allScheduleInfo);
+//        Map<String, JsonObject> infoMap = new HashMap<>();
+//        Map<Integer, Integer> tmePeriod = ScheduleUtil.getTmePeriod();
+//        for (JsonElement jsonElement : allScheduleInfo) {
+//            JsonObject asJsonObject = jsonElement.getAsJsonObject();
+//            String numberOfDayName = asJsonObject.get("numberOfDayName").getAsString();
+//            JsonObject json = new JsonObject();
+//            json.add("startTime", asJsonObject.get("startTime"));
+//            json.add("endTime", asJsonObject.get("endTime"));
+//            json.addProperty("tmePeriod", tmePeriod.get(asJsonObject.get("timeOption").getAsInt()));
+//            json.add("numberOfDay", asJsonObject.get("numberOfDay"));
+//            infoMap.put(numberOfDayName, json);
+//        }
+//        System.out.println(JsonUtil.asString(infoMap));
 
     }