Просмотр исходного кода

Merge branch 'master' of http://git.cc-lotus.info/new_train/service-center

reloaded 4 лет назад
Родитель
Сommit
cbd356c8f7
1 измененных файлов с 4 добавлено и 1 удалено
  1. 4 1
      app/service/school.js

+ 4 - 1
app/service/school.js

@@ -60,7 +60,7 @@ class SchoolService extends CrudService {
     let exceldata = [];
     const sheetNames = workbook.SheetNames; // 获取表名
     const sheet = workbook.Sheets[sheetNames[0]]; // 通过表名得到表对象
-    const theadRule = [ sheet.A1.v, sheet.B1.v, sheet.C1.v, sheet.D1.v, sheet.E1.v, sheet.F1.v, sheet.G1.v, sheet.H1.v, sheet.I1.v, sheet.J1.v, sheet.K1.v, sheet.L1.v, sheet.M1.v, sheet.N1.v, sheet.O1.v, sheet.P1.v ];
+    const theadRule = [ sheet.A1.v, sheet.B1.v, sheet.C1.v, sheet.D1.v, sheet.E1.v, sheet.F1.v, sheet.G1.v, sheet.H1.v, sheet.I1.v, sheet.J1.v, sheet.K1.v, sheet.L1.v, sheet.M1.v, sheet.N1.v, sheet.O1.v, sheet.P1.v, sheet.Q1.v, sheet.R1.v, sheet.S1.v ];
     const params = XLSX.utils.sheet_to_json(sheet); // 通过工具将表对象的数据读出来并转成json
     // const theadRule = [ '序号', '姓名', '性别', '民族', '身份证号', '学校名称', '院系', '专业', '入学年份', '毕业年份', '在校曾担任何种职务', '手机号', 'QQ号', '家庭所在地', '家庭是否困难', '是否获得过助学金' ];
     if (!params) return [];
@@ -86,6 +86,9 @@ class SchoolService extends CrudService {
         family_place: data[theadRule[13]],
         family_is_hard: data[theadRule[14]],
         have_grant: data[theadRule[15]],
+        edua_level: data[theadRule[16]],
+        edua_system: data[theadRule[17]],
+        diy: data[theadRule[18]],
         termid,
         schid,
         planid,