liuyu 4 gadi atpakaļ
vecāks
revīzija
fe76b3444c
4 mainītis faili ar 23 papildinājumiem un 11 dzēšanām
  1. 3 3
      app/controller/.schtime.js
  2. 4 3
      app/model/schtime.js
  3. 13 1
      app/service/school.js
  4. 3 4
      app/service/schtime.js

+ 3 - 3
app/controller/.schtime.js

@@ -1,6 +1,6 @@
 module.exports = {
   create: {
-    requestBody: ["!schid", "year", "planid", "remark", "daterange", "term"],
+    requestBody: ["!schid", "year", "planid", "remark", "daterange", "arrange"],
   },
   destroy: {
     params: ["!id"],
@@ -8,7 +8,7 @@ module.exports = {
   },
   update: {
     params: ["!id"],
-    requestBody: ["schid", "year", "planid", "remark", "daterange", "term"],
+    requestBody: ["schid", "year", "planid", "remark", "daterange", "arrange"],
   },
   show: {
     parameters: {
@@ -24,7 +24,7 @@ module.exports = {
         planid: "planid",
         remark: "remark",
         daterange: "daterange",
-        term: "term",
+        arrange: "arrange",
       },
     },
     service: "query",

+ 4 - 3
app/model/schtime.js

@@ -2,9 +2,10 @@
 const Schema = require('mongoose').Schema;
 const metaPlugin = require('naf-framework-mongoose/lib/model/meta-plugin');
 
-const termInfo = new Schema({
-  termnum: { type: String, required: false, maxLength: 200 }, // 期数
+const arrange = new Schema({
   termid: { type: String, required: false, maxLength: 200 }, // 期id
+  batchid: { type: String, required: false, maxLength: 200 }, // 批次id
+  batchnum: { type: String, required: false, maxLength: 200 }, // 批次
   number: { type: String, required: false, maxLength: 200 }, // 人数
   type: { type: String, required: false, maxLength: 200 }, // 类别
   carnum: { type: String, required: false, maxLength: 200 }, // 派车数量
@@ -18,7 +19,7 @@ const SchtimeSchema = {
   remark: { type: String, required: false, maxLength: 500 }, // 备注
   daterange: { type: [ String ], required: false, maxLength: 500 }, // 学校可以上课时间
   // 此字段不需要暂时先保留
-  term: { type: [ termInfo ], select: true }, // 期
+  arrange: { type: [ arrange ], select: true }, // 期
 };
 
 

+ 13 - 1
app/service/school.js

@@ -60,9 +60,21 @@ 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, sheet.Q1.v, sheet.R1.v, sheet.S1.v ];
+    console.log();
+    // 遍历26个字母
+    const theadRule_ = [];
+    for (const index = 0; index < 26; index++) {
+      console.log(String.fromCharCode((65 + index)));
+      const v_ = String.fromCharCode((65 + index)) + '1';
+      if (sheet.v_) {
+        theadRule_.push(sheet.v_.v);
+      }
+    }
+    console.log(theadRule_);
+    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 ];
     const params = XLSX.utils.sheet_to_json(sheet); // 通过工具将表对象的数据读出来并转成json
     // const theadRule = [ '序号', '姓名', '性别', '民族', '身份证号', '学校名称', '院系', '专业', '入学年份', '毕业年份', '在校曾担任何种职务', '手机号', 'QQ号', '家庭所在地', '家庭是否困难', '是否获得过助学金' ];
+    console.log();
     if (!params) return [];
     let i = 0;
     const length = params.length;

+ 3 - 4
app/service/schtime.js

@@ -27,18 +27,17 @@ class SchtimeService extends CrudService {
         // schtime.remark = elm.remark;
         // schtime.daterange = elm.daterange;
         // // 工具方法整理出需要删除,修改,添加的数据,都是array的形式
-        const { deletearray, updatearray, addarray } = await this.filterarray(schtime.term, elm.term);
-        let termInfo = _.differenceBy(schtime.term, deletearray, 'id');
+        const { deletearray, updatearray, addarray } = await this.filterarray(schtime.arrange, elm.arrange);
+        let termInfo = _.differenceBy(schtime.arrange, deletearray, 'id');
         for (const terminfo of termInfo) {
           const updateinfo = (_.filter(updatearray, item => item.id === terminfo.id))[0];
-          terminfo.termnum = updateinfo.termnum;
           terminfo.termid = updateinfo.termid;
           if (updateinfo.number) terminfo.number = updateinfo.number;
           if (updateinfo.type) terminfo.type = updateinfo.type;
           if (updateinfo.carnum) terminfo.carnum = updateinfo.carnum;
         }
         termInfo = _.concat(termInfo, addarray);
-        schtime.term = termInfo;
+        schtime.arrange = termInfo;
         await schtime.save();
       }