add

app/controller/.ticket.js

@@ -1,6 +1,12 @@
 module.exports = {
   create: {
-    requestBody: ["user_id", "material", "medium_material", "contract"],
+    requestBody: [
+      "user_id",
+      "material",
+      "medium_material",
+      "contract",
+      "mechanism_id",
+    ],
   },
   destroy: {
     params: ["!id"],
@@ -10,6 +16,7 @@ module.exports = {
     params: ["!id"],
     requestBody: [
       "user_id",
+      "mechanism_id",
       "material",
       "medium_material",
       "contract",
@@ -27,6 +34,7 @@ module.exports = {
       query: {
         name: "name",
         user_id: "user_id",
+        mechanism_id: "mechanism_id",
         status: "status",
         "create_time@start": "create_time@start",
         "create_time@end": "create_time@end",

app/model/ticket.js

@@ -6,14 +6,16 @@ const { ObjectId } = require('mongoose').Types;
 // 创新劵表
 const ticket = {
   user_id: { type: ObjectId }, // 用户id
+  mechanism_id: { type: ObjectId }, // 中介机构id
   material: { type: Array }, // 审核资料
   medium_material: { type: Array }, // 中介机构审核资料
   contract: { type: Array }, // 合同
   status: { type: String, default: '0' },
   // 0-资质审核;
-  // 1-准备订单;-1-资质审核失败;
-  // 2-订单入库(中介机构,企业上传合同); -2 - 中介审核失败(重填信息)
-  // 3-创新劵领取成功(服务机构审核成功)
+  // 1-准备订单(企业填资料);-1-资质审核失败;
+  // 2:-企业填写资料完成(中介审核)
+  // 3-订单入库(中介机构,企业上传合同); -3 - 中介审核失败(重填信息)
+  // 4-创新劵领取成功(服务机构审核成功)
   remark: { type: String },
   create_time: { type: String, default: moment(new Date()).format('YYYY-MM-DD HH:mm:ss') },
 };

app/service/ticket.js

@@ -3,6 +3,7 @@ const { CrudService } = require('naf-framework-mongoose/lib/service');
 const { BusinessError, ErrorCode } = require('naf-core').Error;
 const _ = require('lodash');
 const assert = require('assert');
+const { ObjectId } = require('mongoose').Types;
 
 // 超市
 class TicketService extends CrudService {
@@ -14,6 +15,8 @@ class TicketService extends CrudService {
 
   async query({ skip = 0, limit = 0, ...query } = {}) {
     const nquery = _.omit(query, [ 'name' ]);
+    if (nquery.user_id) nquery.user_id = ObjectId(nquery.user_id);
+    if (nquery.mechanism_id) nquery.mechanism_id = ObjectId(nquery.mechanism_id);
     const arr = [
       { $match: nquery },
       {