瀏覽代碼

课表同步调整修复bug

dzx 1 年之前
父節點
當前提交
b84a453bd9

+ 4 - 1
src/main/java/com/xjrsoft/module/schedule/util/DataUtil.java

@@ -14,6 +14,7 @@ import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.schedule.vo.ClassroomJianyuekbVo;
 import com.xjrsoft.module.schedule.vo.StudentJianyuekbVo;
 import com.xjrsoft.module.teacher.entity.XjrUser;
+import lombok.extern.slf4j.Slf4j;
 
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
@@ -27,6 +28,7 @@ import java.util.Map;
  * @author dzx
  * @date 2024/1/23
  */
+@Slf4j
 public class DataUtil {
 
     public Map<Long, String> insertClass(Db db, String tableName, Map<Long, String> gradeMap,
@@ -486,6 +488,7 @@ public class DataUtil {
                 sql += teacherMap.get(teacherJson.get("teacherSerialNo").getAsString()) + ","
                     + "'" + teacherJson.get("name").getAsString() + "',"
                     + "'" + teacherJson.get("teacherSerialNo").getAsString() + "',";
+                log.info("teachers.size():" + teachers.size());
             }else{
                 sql += "0,'',null,";
             }
@@ -526,12 +529,12 @@ public class DataUtil {
             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);
         }
         List<String> sqls = new ArrayList<>();
         int count = 1;
         for (String number : infoMap.keySet()) {
-            String substring = number.substring(0);
             String substring1 = number.substring(number.length() - 1);
             JsonObject jsonObject = infoMap.get(number);
             long id = System.currentTimeMillis();

+ 4 - 4
src/main/java/com/xjrsoft/module/schedule/vo/ClassroomJianyuekbVo.java

@@ -16,15 +16,15 @@ public class ClassroomJianyuekbVo {
     private String name;
 
 
-    @ApiModelProperty("姓名")
+    @ApiModelProperty("人数")
     private String peopleCount;
 
 
-    @ApiModelProperty("年级id")
-    private Long location;
+    @ApiModelProperty("地址")
+    private String location;
 
 
-    @ApiModelProperty("别名")
+    @ApiModelProperty("楼层")
     private String floor;