diff --git a/Doc/数据上报系统测试账号.txt b/Doc/数据上报系统测试账号.txt new file mode 100644 index 00000000..f40634b3 --- /dev/null +++ b/Doc/数据上报系统测试账号.txt @@ -0,0 +1,7 @@ +资产管理干事 +装备中心 +丁虹元 dinghongyuan 123456 + +校办干事 +长春市第二中学 +刘德华 liudehua 123456 \ No newline at end of file diff --git a/src/main/java/com/dsideal/QingLong/Menu/Model/MenuModel.java b/src/main/java/com/dsideal/QingLong/Menu/Model/MenuModel.java index 69f61ce0..e28c7c1e 100644 --- a/src/main/java/com/dsideal/QingLong/Menu/Model/MenuModel.java +++ b/src/main/java/com/dsideal/QingLong/Menu/Model/MenuModel.java @@ -79,7 +79,7 @@ public class MenuModel { Record record = new Record(); record.set("duties_id", duties_id); record.set("in_charge_id", in_charge_id); - record.set("menu_id", menu_array[i]); + record.set("menu_id", Integer.parseInt(menu_array[i])); list.add(record); } if (list.size() > 0) Db.batchSave("t_base_principalship_menu", list, 100); diff --git a/src/main/java/com/dsideal/QingLong/Teacher/Model/TeacherModel.java b/src/main/java/com/dsideal/QingLong/Teacher/Model/TeacherModel.java index 51c14b75..abf525c0 100644 --- a/src/main/java/com/dsideal/QingLong/Teacher/Model/TeacherModel.java +++ b/src/main/java/com/dsideal/QingLong/Teacher/Model/TeacherModel.java @@ -76,10 +76,11 @@ public class TeacherModel { re.set("bureau_id", bureau_id); re.set("main_school_id", main_school_id); re.set("b_use", 1); - re.set("duties_id", jsonObject.getString("duties_id")); - re.set("in_charge_id", jsonObject.getString("in_charge_id")); + re.set("duties_id", Integer.parseInt(jsonObject.getString("duties_id"))); + re.set("in_charge_id", Integer.parseInt(jsonObject.getString("in_charge_id"))); re.set("operator", operator); re.set("ip_address", IpUtil.ipToLong(ip_address)); + re.set("update_ts", DateTime.now()); Db.save("t_person_duty_charge", "id", re); } } diff --git a/src/main/resource/Excel/school.xlsx b/src/main/resource/Excel/school.xlsx index 9ed7cbed..286ea094 100644 Binary files a/src/main/resource/Excel/school.xlsx and b/src/main/resource/Excel/school.xlsx differ