lrf402788946 4 роки тому
батько
коміт
5089a79b27

+ 3 - 0
app/controller/.mechanism.js

@@ -7,6 +7,7 @@ module.exports = {
       "passwd",
       "email",
       "address",
+      "juris",
       "industry",
     ],
   },
@@ -23,6 +24,7 @@ module.exports = {
       "email",
       "address",
       "industry",
+      "juris",
       "status",
     ],
   },
@@ -37,6 +39,7 @@ module.exports = {
       query: {
         name: "name",
         industry: "industry",
+        juris: "juris",
         "create_time@start": "create_time@start",
         "create_time@end": "create_time@end",
       },

+ 41 - 36
app/controller/.organization.js

@@ -9,20 +9,22 @@ module.exports = {
       "code",
       "office_phone",
       "profession",
-      'institution_code',
-      'companytype',
-      'companydate',
-      'companycapital',
-      'companyperson',
-      'sndqyzsr',
-      'sndyffy',
-      'companytotal',
-      'zjzyfrs',
-      'companybrief',
-      'mainproduct',
-      'qualifications',
-      'remark',
-      'status',
+      "institution_code",
+      "companytype",
+      "companydate",
+      "companycapital",
+      "companyperson",
+      "sndqyzsr",
+      "sndyffy",
+      "companytotal",
+      "zjzyfrs",
+      "companybrief",
+      "mainproduct",
+      "qualifications",
+      "remark",
+      "juris",
+      "openid",
+      "status",
     ],
   },
   destroy: {
@@ -39,20 +41,22 @@ module.exports = {
       "code",
       "office_phone",
       "profession",
-      'institution_code',
-      'companytype',
-      'companydate',
-      'companycapital',
-      'companyperson',
-      'sndqyzsr',
-      'sndyffy',
-      'companytotal',
-      'zjzyfrs',
-      'companybrief',
-      'mainproduct',
-      'qualifications',
-      'remark',
-      'status'
+      "institution_code",
+      "companytype",
+      "companydate",
+      "companycapital",
+      "companyperson",
+      "sndqyzsr",
+      "sndyffy",
+      "companytotal",
+      "zjzyfrs",
+      "companybrief",
+      "mainproduct",
+      "qualifications",
+      "remark",
+      "juris",
+      "openid",
+      "status",
     ],
   },
   show: {
@@ -64,17 +68,18 @@ module.exports = {
   index: {
     parameters: {
       query: {
-        phone:"phone",
-        code:"code",
-        profession:"profession",
-        institution_code:"institution_code",
-        companyperson:"companyperson",
-        status:"status",
+        phone: "phone",
+        code: "code",
+        profession: "profession",
+        institution_code: "institution_code",
+        companyperson: "companyperson",
+        status: "status",
+        juris: "juris",
         "create_time@start": "create_time@start",
         "create_time@end": "create_time@end",
       },
       options: {
-        "isdel": '0' // 默认条件
+        isdel: "0", // 默认条件
       },
     },
     service: "query",
@@ -95,5 +100,5 @@ module.exports = {
   login: {
     requestBody: ["institution_code", "passwd"],
     service: "login",
-  }
+  },
 };

+ 1 - 1
app/controller/ticket.js

@@ -3,7 +3,7 @@ const meta = require('./.ticket.js');
 const Controller = require('egg').Controller;
 const { CrudController } = require('naf-framework-mongoose/lib/controller');
 
-// 创新券
+// 高企申报
 class TicketController extends Controller {
   constructor(ctx) {
     super(ctx);

+ 2 - 0
app/model/mechanism.js

@@ -13,6 +13,8 @@ const mechanism = {
   email: { type: String }, // 电子邮箱
   address: { type: String }, // 联系地址
   industry: { type: String }, // 所属行业
+  // 21-05-07添加区字段
+  juris: { type: String }, // 辖区
   status: { type: String, required: false, default: '0', maxLength: 200 }, // 审核状态,0-注册,1-通过,2-拒绝
   isdel: { type: String, required: false, default: '0' }, // 0=>未删除;1=>已删除
   remark: { type: String },

+ 3 - 0
app/model/organization.js

@@ -29,6 +29,9 @@ const organization = {
   qualifications: { type: String, required: false, maxLength: 300 }, // 企业资质&荣誉
   status: { type: String, required: false, default: '0', maxLength: 200 }, // 审核状态,0-注册,1-通过,2-拒绝
 
+  // 21-05-07添加区字段
+  juris: { type: String }, // 辖区
+  openid: { type: Array }, // 微信绑定 [{name:"微信昵称",openid:value}],多人管理一个账号,方便删除
   isdel: { type: String, required: false, default: '0' }, // 0=>未删除;1=>已删除
   remark: { type: String, maxLength: 200 },
   create_time: { type: String, default: moment().format('YYYY-MM-DD HH:mm:ss') },

+ 4 - 6
app/model/ticket.js

@@ -3,7 +3,7 @@ const Schema = require('mongoose').Schema;
 const moment = require('moment');
 const metaPlugin = require('naf-framework-mongoose/lib/model/meta-plugin');
 const { ObjectId } = require('mongoose').Types;
-// 创新劵
+// 高企申报
 const ticket = {
   user_id: { type: ObjectId }, // 用户id
   mechanism_id: { type: ObjectId }, // 中介机构id
@@ -11,11 +11,9 @@ const ticket = {
   medium_material: { type: Array }, // 中介机构审核资料
   contract: { type: Array }, // 合同
   status: { type: String, default: '0' },
-  // 0-资质审核;
-  // 1-准备订单(企业填资料);-1-资质审查失败;
-  // 2:-企业填写资料完成(中介审核)
-  // 3-订单入库(中介机构,企业上传合同); -3 - 中介审核失败(重填信息)
-  // 4-创新劵领取成功(服务机构审核成功)
+  // 0-初审;
+  // 1-初审通过(企业,中介上传合同);-1-初审失败;
+  // 2-高企申报成功;-2:高企申报失败
   remark: { type: String },
   create_time: { type: String, default: moment(new Date()).format('YYYY-MM-DD HH:mm:ss') },
 };

+ 1 - 1
app/service/ticket.js

@@ -5,7 +5,7 @@ const _ = require('lodash');
 const assert = require('assert');
 const { ObjectId } = require('mongoose').Types;
 
-// 超市
+// 高企申报
 class TicketService extends CrudService {
   constructor(ctx) {
     super(ctx, 'ticket');