Selaa lähdekoodia

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

liuyu 5 vuotta sitten
vanhempi
commit
19331eba9a

+ 40 - 0
app/controller/.termquest.js

@@ -0,0 +1,40 @@
+module.exports = {
+  create: {
+    requestBody: [
+      '!termid',
+      '!questionnaireid'
+    ]
+  },
+  destroy: {
+    params: ['!id'],
+    service: 'delete'
+  },
+  update: {
+    params: ['!id'],
+    requestBody: [
+      'termid',
+      'questionnaireid'
+    ]
+  },
+  show: {
+    parameters: {
+      params: ['!id']
+    },
+    service: 'fetch'
+  },
+  index: {
+    parameters: {
+      query: {
+        termid :'termid',
+        questionnaireid:'questionnaireid'
+      }
+    },
+    service: 'query',
+    options: {
+      query: ['skip', 'limit'],
+      sort: ['meta.createdAt'],
+      desc: true,
+      count: true
+    }
+  },
+};

+ 23 - 0
app/controller/termquest.js

@@ -0,0 +1,23 @@
+'use strict';
+
+const _ = require('lodash');
+const meta = require('./.termquest.js');
+const Controller = require('egg').Controller;
+const { CrudController } = require('naf-framework-mongoose/lib/controller');
+
+// 每期可答问卷表管理
+class TermquestController extends Controller {
+
+  constructor(ctx) {
+    super(ctx);
+    this.service = this.ctx.service.termquest;
+  }
+
+  async queryteacher() {
+    const data = await this.service.queryteacher(this.ctx.request.query);
+    this.ctx.ok({ data });
+  }
+
+}
+
+module.exports = CrudController(TermquestController, meta);

+ 19 - 0
app/model/termquest.js

@@ -0,0 +1,19 @@
+'use strict';
+const Schema = require('mongoose').Schema;
+const metaPlugin = require('naf-framework-mongoose/lib/model/meta-plugin');
+
+// 每期可答问卷表
+const TermquestSchema = {
+  termid: { type: String, required: true, maxLength: 200 }, // 期id
+  questionnaireid: [ String ], // 问卷id
+};
+
+
+const schema = new Schema(TermquestSchema, { toJSON: { virtuals: true } });
+schema.index({ id: 1 });
+schema.plugin(metaPlugin);
+
+module.exports = app => {
+  const { mongoose } = app;
+  return mongoose.model('Termquest', schema, 'termquest');
+};

+ 4 - 0
app/router.js

@@ -130,4 +130,8 @@ module.exports = app => {
   router.post('user', '/api/train/user/update/:id', controller.user.update);
   router.post('user', '/api/train/user/register', controller.user.register);// 学校注册
   router.post('user', '/api/train/user/bind', controller.user.bind);// 学生或班主任微信绑定
+
+  // 行政区划表设置路由
+  router.resources('termquest', '/api/train/termquest', controller.termquest); // index、create、show、destroy
+  router.post('termquest', '/api/train/termquest/update/:id', controller.termquest.update);
 };

+ 52 - 0
app/service/leave.js

@@ -13,6 +13,7 @@ class LeaveService extends CrudService {
     this.model = this.ctx.model.Leave;
     this.smodel = this.ctx.model.Student;
     this.umodel = this.ctx.model.User;
+    this.cmodel = this.ctx.model.Class;
   }
   async create(data) {
     const newdata = { ...data, status: '0' };
@@ -29,6 +30,57 @@ class LeaveService extends CrudService {
     return await this.fetch({ id: entity.id });
   }
 
+  async update({ id }, data) {
+    const leave = await this.model.findById(id);
+    const { studentid, starttime, endtime, reason, status, refcause } = data;
+    if (studentid) {
+      leave.studentid = studentid;
+    }
+    if (starttime) {
+      leave.starttime = starttime;
+    }
+    if (endtime) {
+      leave.endtime = endtime;
+    }
+    if (reason) {
+      leave.reason = reason;
+    }
+    if (status) {
+      const student = await this.smodel.findById(studentid);
+      const remark = '感谢您的使用';
+      const stuuser = await this.umodel.findOne({ uid: studentid });
+      if (status === '1') {
+        let detail = student.name + '的请假申请已通过,请及时查收!';
+        const users = await this.umodel.find({ type: '0' });
+        for (const user of users) {
+          const openid = user.openid;
+          const date = await this.ctx.service.util.updatedate();
+          await this.ctx.service.weixin.sendTemplateMsg(this.ctx.app.config.REVIEW_TEMPLATE_ID, openid, '您有一个新的通知', detail, date, remark);
+        }
+        const _class = await this.cmodel.findById(student.classid);
+        const headteacherid = _class.headteacherid;
+        const headuser = await this.umodel.findOne({ uid: headteacherid });
+        const openid = headuser.openid;
+        const date = await this.ctx.service.util.updatedate();
+        await this.ctx.service.weixin.sendTemplateMsg(this.ctx.app.config.REVIEW_TEMPLATE_ID, openid, '您有一个新的通知', detail, date, remark);
+        const stuopenid = stuuser.openid;
+        detail = '您的请假申请已通过,请及时查收!';
+        await this.ctx.service.weixin.sendTemplateMsg(this.ctx.app.config.REVIEW_TEMPLATE_ID, stuopenid, '您有一个新的通知', detail, date, remark);
+
+      }
+      if (status === '2') {
+        const detail = '您的请假申请已被拒绝,拒绝原因为:' + refcause;
+        const openid = stuuser.openid;
+        const date = await this.ctx.service.util.updatedate();
+        await this.ctx.service.weixin.sendTemplateMsg(this.ctx.app.config.REVIEW_TEMPLATE_ID, openid, '您有一个新的通知', detail, date, remark);
+      }
+    }
+    if (refcause) {
+      leave.refcause = refcause;
+    }
+    return await leave.save();
+  }
+
 }
 
 module.exports = LeaveService;

+ 19 - 0
app/service/termquest.js

@@ -0,0 +1,19 @@
+'use strict';
+
+
+const assert = require('assert');
+const _ = require('lodash');
+const { ObjectId } = require('mongoose').Types;
+const { CrudService } = require('naf-framework-mongoose/lib/service');
+const { BusinessError, ErrorCode } = require('naf-core').Error;
+
+class TermquestService extends CrudService {
+  constructor(ctx) {
+    super(ctx, 'termquest');
+    this.model = this.ctx.model.Termquest;
+  }
+
+
+}
+
+module.exports = TermquestService;