Explorar el Código

增加审核记录表

guhongwei hace 3 años
padre
commit
f5e79d026d

+ 0 - 13
app/controller/achieve_verify_record.js

@@ -1,13 +0,0 @@
-'use strict';
-const meta = require('./config/.achieve_verify_record.js');
-const Controller = require('egg').Controller;
-const { CrudController } = require('naf-framework-mongoose/lib/controller');
-
-// 审核记录
-class Achieve_verify_recordController extends Controller {
-  constructor(ctx) {
-    super(ctx);
-    this.service = this.ctx.service.achieveVerifyRecord;
-  }
-}
-module.exports = CrudController(Achieve_verify_recordController, meta);

+ 13 - 0
app/controller/check_record.js

@@ -0,0 +1,13 @@
+'use strict';
+const meta = require('./config/.check_record.js');
+const Controller = require('egg').Controller;
+const { CrudController } = require('naf-framework-mongoose-free/lib/controller');
+
+// 评审记录表
+class Check_recordController extends Controller {
+  constructor(ctx) {
+    super(ctx);
+    this.service = this.ctx.service.checkRecord;
+  }
+}
+module.exports = CrudController(Check_recordController, meta);

+ 4 - 4
app/controller/config/.achieve_verify_record.js

@@ -1,10 +1,10 @@
 module.exports = {
   create: {
     requestBody: [
-      "!apply_id",
+      "apply_id",
       "desc",
       "status",
-      "!verify_id",
+      "verify_id",
       "verify_phone",
       "verify",
       "step",
@@ -37,8 +37,8 @@ module.exports = {
       query: {
         apply_id: "apply_id",
         step: "step",
-        "create_time@start": "create_time@start",
-        "create_time@end": "create_time@end",
+        "meta.createdAt@start": "meta.createdAt@start",
+        "meta.createdAt@end": "meta.createdAt@end",
       },
       // options: {
       //   "meta.state": 0 // 默认条件

+ 7 - 8
app/model/achieve_verify_record.js

@@ -1,26 +1,25 @@
 'use strict';
 const Schema = require('mongoose').Schema;
 const moment = require('moment');
-const metaPlugin = require('naf-framework-mongoose/lib/model/meta-plugin');
+const metaPlugin = require('naf-framework-mongoose-free/lib/model/meta-plugin');
 const { ObjectId } = require('mongoose').Types;
 // 审核记录表
-const achieve_verify_record = {
-  apply_id: { type: ObjectId }, // 成果申请数据id
+const check_record = {
+  apply_id: { type: String }, // 成果申请数据id
   desc: { type: String }, // 本次审核的意见
   status: { type: String }, // 本次审核的结果
-  verify_id: { type: ObjectId }, // 本次审核人
+  verify_id: { type: String }, // 本次审核人
   verify_phone: { type: String }, // 本次审核人的联系电话
   verify: { type: String }, // 本次审核人
   step: { type: String }, // 初审=>评分=>会审=>资料/发证书
-  remark: { type: String, maxLength: 200 },
-  create_time: { type: String, default: moment().format('YYYY-MM-DD HH:mm:ss') },
+  remark: { type: String },
 };
-const schema = new Schema(achieve_verify_record, { toJSON: { virtuals: true } });
+const schema = new Schema(check_record, { toJSON: { virtuals: true } });
 schema.index({ id: 1 });
 schema.index({ apply_id: 1 });
 schema.index({ 'meta.createdAt': 1 });
 schema.plugin(metaPlugin);
 module.exports = app => {
   const { mongoose } = app;
-  return mongoose.model('Achieve_verify_record', schema, 'achieve_verify_record');
+  return mongoose.model('Check_record', schema, 'check_record');
 };

+ 1 - 1
app/router.js

@@ -14,5 +14,5 @@ module.exports = app => {
   require('./z_router/apply')(app); // 申报
   require('./z_router/expert')(app); // 专家
   require('./z_router/review_expert')(app); // 专家评审
-  require('./z_router/achieve_verify_record')(app); // 评审记录表
+  require('./z_router/check_record')(app); // 评审记录表
 };

+ 4 - 4
app/service/achieve_verify_record.js

@@ -5,11 +5,11 @@ const _ = require('lodash');
 const assert = require('assert');
 
 // 评审记录表
-class Achieve_verify_recordService extends CrudService {
+class Check_recordService extends CrudService {
   constructor(ctx) {
-    super(ctx, 'achieve_verify_record');
-    this.model = this.ctx.model.AchieveVerifyRecord;
+    super(ctx, 'check_record');
+    this.model = this.ctx.model.RheckRecord;
   }
 }
 
-module.exports = Achieve_verify_recordService;
+module.exports = Check_recordService;

+ 2 - 2
app/z_router/achieve_verify_record.js

@@ -1,7 +1,7 @@
 'use strict';
 // 路由配置
-const rkey = 'AchieveVerifyRecord';
-const ckey = 'AchieveVerifyRecord';
+const rkey = 'checkRecord';
+const ckey = 'checkRecord';
 const keyZh = '评审记录表';
 const routes = [
   { method: 'get', path: `${rkey}`, controller: `${ckey}.index`, name: `${ckey}Query`, zh: `${keyZh}列表查询` },