huanghai
/
QingLong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

Browse Source
main
kgdxpr 1 year ago
parent b6b3b5fe58 c225c8d26e
commit 671a4ac579
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File

25
src/main/java/com/dsideal/QingLong/ExcelImportTemplate/StudentImportExcelUtil.java
Unescape View File

@ -1,6 +1,7 @@
package com.dsideal.QingLong.ExcelImportTemplate;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.dsideal.QingLong.Classes.Model.ClassModel;
@ -409,16 +410,16 @@ public class StudentImportExcelUtil {
* @param bureau_id
* @return
*/
public static JSONObject SaveBatch(String batch_id, String bureau_id, String operator, String ip_address) throws Exception {
public static JSONObject SaveBatch(String batch_id, String bureau_id, String operator, String ip_address) {
String city_id;
String area_id;
String main_school_id;
OrganizationModel orgModel = new OrganizationModel();
List<Record> rs = orgModel.getAreaIdByParentId(bureau_id);
if (rs != null && rs.size() > 0) {
city_id = rs.get(0).getStr("city_id");
area_id = rs.get(0).getStr("area_id");
main_school_id = rs.get(0).getStr("main_school_id");
if (rs != null && !rs.isEmpty()) {
city_id = rs.getFirst().getStr("city_id");
area_id = rs.getFirst().getStr("area_id");
main_school_id = rs.getFirst().getStr("main_school_id");
} else {
city_id = "-1";
area_id = "-1";
@ -444,7 +445,7 @@ public class StudentImportExcelUtil {
if (!map.containsKey(stage_id + "_" + cName)) {
Record r = new Record();
r.set("class_name", cName);
r.set("stage_id", stage_id);
r.set("stage_id", Integer.parseInt(stage_id));
list.add(r);
}
}
@ -458,11 +459,11 @@ public class StudentImportExcelUtil {
Record record = new Record();
record.set("class_id", classId);
record.set("class_name", class_name);
record.set("class_num", jo.getString("classNum"));
record.set("stage_id", stage_id);
record.set("class_num", Integer.parseInt(jo.getString("classNum")));
record.set("stage_id", Integer.parseInt(stage_id));
ClassModel classModel = new ClassModel();
record.set("class_code", classModel.generateClassCode(Integer.parseInt(jo.getString("entry_year")), stage_id, Integer.parseInt(jo.getString("classNum"))));
record.set("entry_year", jo.getString("entry_year"));
record.set("entry_year", Integer.parseInt(jo.getString("entry_year")));
int school_length = 0;
//根据学段换算出几年毕业
@ -539,13 +540,13 @@ public class StudentImportExcelUtil {
String pwd = CommonUtil.getLdapPassword(originalPwd);
record.set("pwd", pwd);
record.set("person_name", rs.get(i).getStr("person_name"));
record.set("xb", Integer.parseInt(rs.get(i).getStr("xb_id")));
record.set("xb", Integer.parseInt(rs.get(i).getStr("xb_id").trim()));
record.set("mz", rs.get(i).getStr("mz_id"));
String idcard_code = rs.get(i).getStr("idcard_code");
record.set("idcard_code", idcard_code);
//根据身份证号换算出生日期
Map<String, String> m = IDCardUtil.getBirAgeSex(rs.get(i).getStr("idcard_code"));
record.set("birthday", m.get("birthday"));
record.set("birthday", DateUtil.parse(m.get("birthday")));
record.set("create_time", CommonUtil.GetCurrentTimeString());
record.set("sort_id", 1);
record.set("original_pwd", originalPwd);
@ -878,7 +879,7 @@ public class StudentImportExcelUtil {
record.set("idcard_code_aes", idcard_code);
record.set("source", Integer.parseInt(mapSource.get(source)));
record.set("bureau_id", bureau_id);
record.set("update_ts",DateTime.now());
record.set("update_ts", DateTime.now());
records.add(record);
}
//准备批量导入

Write Preview
Loading…
Cancel
Save