chen пре 5 година
родитељ
комит
e71726b2bb
4 измењених фајлова са 164 додато и 113 уклоњено
  1. 106 76
      app/controller/.companyidentify.js
  2. 34 25
      app/model/companyidentify.js
  3. 22 11
      app/model/companyup.js
  4. 2 1
      app/service/companyidentify.js

+ 106 - 76
app/controller/.companyidentify.js

@@ -3,32 +3,41 @@ module.exports = {
     requestBody: [
       '!uid',
       '!company_name',
-      '!code',
-      'business_license',
-      'establish_date',
-      'due_date',
-      'type',
-      'registered_capital',
-      'total_assets',
-      'taking',
-      'number',
-      'belong_type',
-      'profession_one',
-      'profession_two',
-      'profession_three',
-      'profession_four',
-      'belong_addr_city',
-      'belong_addr_area',
-      'business_addr',
-      'registered_addr',
-      'business_scope',
-      'introduction',
-      'card_front',
-      'card_back',
-      'representative',
-      'representative_id',
-      'representative_phone',
-      'status'
+      '!reg_num',
+      '!type',
+      '!address',
+      '!business',
+      '!capital',
+      '!establish_date',
+      '!valid_period',
+      '!person',
+      'status',
+      // '!code',
+      // 'business_license',
+      // 'establish_date',
+      // 'due_date',
+      // 'type',
+      // 'registered_capital',
+      // 'total_assets',
+      // 'taking',
+      // 'number',
+      // 'belong_type',
+      // 'profession_one',
+      // 'profession_two',
+      // 'profession_three',
+      // 'profession_four',
+      // 'belong_addr_city',
+      // 'belong_addr_area',
+      // 'business_addr',
+      // 'registered_addr',
+      // 'business_scope',
+      // 'introduction',
+      // 'card_front',
+      // 'card_back',
+      // 'representative',
+      // 'representative_id',
+      // 'representative_phone',
+      // 'status'
     ]
   },
   destroy: {
@@ -39,33 +48,44 @@ module.exports = {
     params: ['!id'],
     requestBody: [
       'uid',
-      'business_license',
       'company_name',
-      'establish_date',
-      'due_date',
+      'reg_num',
       'type',
-      'code',
-      'registered_capital',
-      'total_assets',
-      'taking',
-      'number',
-      'belong_type',
-      'profession_one',
-      'profession_two',
-      'profession_three',
-      'profession_four',
-      'belong_addr_city',
-      'belong_addr_area',
-      'business_addr',
-      'registered_addr',
-      'business_scope',
-      'introduction',
-      'card_front',
-      'card_back',
-      'representative',
-      'representative_id',
-      'representative_phone',
-      'status'
+      'address',
+      'business',
+      'capital',
+      'establish_date',
+      'valid_period',
+      'person',
+      'status',
+      // 'uid',
+      // 'business_license',
+      // 'company_name',
+      // 'establish_date',
+      // 'due_date',
+      // 'type',
+      // 'code',
+      // 'registered_capital',
+      // 'total_assets',
+      // 'taking',
+      // 'number',
+      // 'belong_type',
+      // 'profession_one',
+      // 'profession_two',
+      // 'profession_three',
+      // 'profession_four',
+      // 'belong_addr_city',
+      // 'belong_addr_area',
+      // 'business_addr',
+      // 'registered_addr',
+      // 'business_scope',
+      // 'introduction',
+      // 'card_front',
+      // 'card_back',
+      // 'representative',
+      // 'representative_id',
+      // 'representative_phone',
+      // 'status'
     ]
   },
   show: {
@@ -78,33 +98,43 @@ module.exports = {
     parameters: {
       query: {
         uid:'uid',
-        business_license:'business_license',
-        company_name:'%company_name%',
-        establish_date :'establish_date',
-        due_date:'due_date',
+        company_name:'company_name',
+        reg_num:'reg_num',
         type:'type',
-        code:'code',
-        registered_capital :'registered_capital',
-        total_assets :'total_assets',
-        taking:'taking',
-        number:'number',
-        belong_type :'belong_type',
-        profession_one:'profession_one',
-        profession_two :'profession_two',
-        profession_three :'profession_three',
-        profession_four :'profession_four',
-        belong_addr_city :'belong_addr_city',
-        belong_addr_area :'belong_addr_area',
-        business_addr :'business_addr',
-        registered_addr :'registered_addr',
-        business_scope :'business_scope',
-        introduction :'introduction',
-        card_front :'card_front',
-        card_back:'card_back',
-        representative :'representative',
-        representative_id :'representative_id',
-        representative_phone :'representative_phone',
+        address:'address',
+        business:'business',
+        capital:'capital',
+        establish_date:'establish_date',
+        valid_period:'valid_period',
+        person:'person',
         status:'status'
+        // business_license:'business_license',
+        // company_name:'%company_name%',
+        // establish_date :'establish_date',
+        // due_date:'due_date',
+        // type:'type',
+        // code:'code',
+        // registered_capital :'registered_capital',
+        // total_assets :'total_assets',
+        // taking:'taking',
+        // number:'number',
+        // belong_type :'belong_type',
+        // profession_one:'profession_one',
+        // profession_two :'profession_two',
+        // profession_three :'profession_three',
+        // profession_four :'profession_four',
+        // belong_addr_city :'belong_addr_city',
+        // belong_addr_area :'belong_addr_area',
+        // business_addr :'business_addr',
+        // registered_addr :'registered_addr',
+        // business_scope :'business_scope',
+        // introduction :'introduction',
+        // card_front :'card_front',
+        // card_back:'card_back',
+        // representative :'representative',
+        // representative_id :'representative_id',
+        // representative_phone :'representative_phone',
+        // status:'status'
       }
     },
     service: 'query',

+ 34 - 25
app/model/companyidentify.js

@@ -7,32 +7,41 @@ const { Secret } = require('naf-framework-mongoose/lib/model/schema');
 const CompanyidentifySchema = {
   uid: { type: String, required: true, maxLength: 200 }, // 关联企业用户id                  必填
   company_name: { type: String, required: true, maxLength: 200 }, // 企业名称               必填
-  code: { type: String, required: true, maxLength: 200 }, // 统一社会信用代码                必填
-  business_license: { type: String, required: false, maxLength: 200 }, // 营业执照图片
-  establish_date: { type: String, required: false, maxLength: 200 }, // 成立日期
-  due_date: { type: String, required: false, maxLength: 200 }, // 营业到期日期
-  type: { type: String, required: false, maxLength: 200 }, // 企业类型
-  registered_capital: { type: String, required: false, maxLength: 200 }, // 注册资本
-  total_assets: { type: String, required: false, maxLength: 200 }, // 资产总额
-  taking: { type: String, required: false, maxLength: 200 }, // 营业收入
-  number: { type: String, required: false, maxLength: 200 }, // 从业人员数量
-  belong_type: { type: String, required: false, maxLength: 200 }, // 企业所属类型
-  profession_one: { type: String, required: false, maxLength: 200 }, // 所属一级行业
-  profession_two: { type: String, required: false, maxLength: 200 }, // 所属二级行业
-  profession_three: { type: String, required: false, maxLength: 200 }, // 所属三级行业
-  profession_four: { type: String, required: false, maxLength: 200 }, // 所属四级行业
-  belong_addr_city: { type: String, required: false, maxLength: 200 }, // 企业所属地-市
-  belong_addr_area: { type: String, required: false, maxLength: 200 }, // 企业所属地-区
-  business_addr: { type: String, required: false, maxLength: 200 }, // 经营地址
-  registered_addr: { type: String, required: false, maxLength: 200 }, // 注册地址
-  business_scope: { type: String, required: false, maxLength: 200 }, // 经营范围
-  introduction: { type: String, required: false }, // 企业简介
-  card_front: { type: String, required: false, maxLength: 200 }, // 身份证正面图
-  card_back: { type: String, required: false, maxLength: 200 }, // 身份证背面图
-  representative: { type: String, required: false, maxLength: 200 }, // 法定代表人
-  representative_id: { type: String, required: false, maxLength: 200 }, // 法人证件号
-  representative_phone: { type: String, required: false, maxLength: 200 }, // 法人手机号
+  reg_num: { type: String, required: true, maxLength: 200 }, // 统一社会信用代码            必填
+  type: { type: String, required: true, maxLength: 200 }, //      公司类型                  必填
+  address: { type: String, required: true, maxLength: 200 }, // 地址                        必填
+  business: { type: String, required: true, maxLength: 200 }, // 经营范围                   必填
+  capital: { type: String, required: true, maxLength: 200 }, // 注册资本                    必填
+  establish_date: { type: String, required: true, maxLength: 200 }, // 成立日期             必填
+  valid_period: { type: String, required: true, maxLength: 200 }, //    公司营业期限终止日期      "长期"表示为"29991231"
+  person: { type: String, required: true, maxLength: 200 }, //      法定代表人      必填
   status: { type: String, required: false, maxLength: 200, default: '0' }, // 认证状态,0-认证中,1-认证通过,2-认证失败
+
+  // business_license: { type: String, required: false, maxLength: 200 }, // 营业执照图片
+  // establish_date: { type: String, required: false, maxLength: 200 }, // 成立日期
+  // due_date: { type: String, required: false, maxLength: 200 }, // 营业到期日期
+  // type: { type: String, required: false, maxLength: 200 }, // 企业类型
+  // registered_capital: { type: String, required: false, maxLength: 200 }, // 注册资本
+  // total_assets: { type: String, required: false, maxLength: 200 }, // 资产总额
+  // taking: { type: String, required: false, maxLength: 200 }, // 营业收入
+  // number: { type: String, required: false, maxLength: 200 }, // 从业人员数量
+  // belong_type: { type: String, required: false, maxLength: 200 }, // 企业所属类型
+  // profession_one: { type: String, required: false, maxLength: 200 }, // 所属一级行业
+  // profession_two: { type: String, required: false, maxLength: 200 }, // 所属二级行业
+  // profession_three: { type: String, required: false, maxLength: 200 }, // 所属三级行业
+  // profession_four: { type: String, required: false, maxLength: 200 }, // 所属四级行业
+  // belong_addr_city: { type: String, required: false, maxLength: 200 }, // 企业所属地-市
+  // belong_addr_area: { type: String, required: false, maxLength: 200 }, // 企业所属地-区
+  // business_addr: { type: String, required: false, maxLength: 200 }, // 经营地址
+  // registered_addr: { type: String, required: false, maxLength: 200 }, // 注册地址
+  // business_scope: { type: String, required: false, maxLength: 200 }, // 经营范围
+  // introduction: { type: String, required: false }, // 企业简介
+  // card_front: { type: String, required: false, maxLength: 200 }, // 身份证正面图
+  // card_back: { type: String, required: false, maxLength: 200 }, // 身份证背面图
+  // representative: { type: String, required: false, maxLength: 200 }, // 法定代表人
+  // representative_id: { type: String, required: false, maxLength: 200 }, // 法人证件号
+  // representative_phone: { type: String, required: false, maxLength: 200 }, // 法人手机号
+  // status: { type: String, required: false, maxLength: 200, default: '0' }, // 认证状态,0-认证中,1-认证通过,2-认证失败
 };
 
 

+ 22 - 11
app/model/companyup.js

@@ -7,17 +7,28 @@ const { Secret } = require('naf-framework-mongoose/lib/model/schema');
 const CompanyupSchema = {
   uid: { type: String, required: true, maxLength: 200 }, // 关联企业用户id
   company_name: { type: String, required: true, maxLength: 200 }, // 企业名称
-  registered_addr: { type: String, required: true, maxLength: 500 }, // 工商注册地址
-  business_addr: { type: String, required: true, maxLength: 500 }, // 实际经营地址
-  profession_one: { type: String, required: true, maxLength: 200 }, // 所属一级行业
-  profession_two: { type: String, required: true, maxLength: 200 }, // 所属二级行业
-  profession_three: { type: String, required: true, maxLength: 200 }, // 所属三级行业
-  profession_four: { type: String, required: true, maxLength: 200 }, // 所属四级行业
-  contacts: { type: String, required: false, maxLength: 200 }, // 融资联系人
-  contact_number: { type: String, required: false, maxLength: 200 }, // 联系人手机
-  contact_position: { type: String, required: false, maxLength: 200 }, // 联系人职位
-  contact_email: { type: String, required: false, maxLength: 200 }, // 联系人邮箱
-  telephone: { type: String, required: false, maxLength: 200 }, // 固定电话
+  // cql
+  reg_num: { type: String, required: true, maxLength: 200 }, // 统一社会信用代码            必填
+  type: { type: String, required: true, maxLength: 200 }, //      公司类型                  必填
+  address: { type: String, required: true, maxLength: 200 }, // 地址                        必填
+  business: { type: String, required: true, maxLength: 200 }, // 经营范围                   必填
+  capital: { type: String, required: true, maxLength: 200 }, // 注册资本                    必填
+  establish_date: { type: String, required: true, maxLength: 200 }, // 成立日期             必填
+  valid_period: { type: String, required: true, maxLength: 200 }, //    公司营业期限终止日期      "长期"表示为"29991231"
+  person: { type: String, required: true, maxLength: 200 }, //      法定代表人      必填
+
+
+  // registered_addr: { type: String, required: true, maxLength: 500 }, // 工商注册地址
+  // business_addr: { type: String, required: true, maxLength: 500 }, // 实际经营地址
+  // profession_one: { type: String, required: true, maxLength: 200 }, // 所属一级行业
+  // profession_two: { type: String, required: true, maxLength: 200 }, // 所属二级行业
+  // profession_three: { type: String, required: true, maxLength: 200 }, // 所属三级行业
+  // profession_four: { type: String, required: true, maxLength: 200 }, // 所属四级行业
+  // contacts: { type: String, required: false, maxLength: 200 }, // 融资联系人
+  // contact_number: { type: String, required: false, maxLength: 200 }, // 联系人手机
+  // contact_position: { type: String, required: false, maxLength: 200 }, // 联系人职位
+  // contact_email: { type: String, required: false, maxLength: 200 }, // 联系人邮箱
+  // telephone: { type: String, required: false, maxLength: 200 }, // 固定电话
   status: { type: String, required: false, maxLength: 200, default: '0' }, // 审核状态,0-审核中,1-审核通过,2-审核拒绝
 };
 

+ 2 - 1
app/service/companyidentify.js

@@ -24,7 +24,8 @@ class CompanyidentifyService extends CrudService {
     // 如果修改状态为1(审核通过)
     if (status === '1') {
       // 将企业认证信息表中的部分字段提取出来,创建用户对应的企业信息表
-      const newdata = _.pick(companyidentify, [ 'uid', 'company_name', 'introduction', 'registered_addr', 'business_addr', 'profession_one', 'profession_two', 'profession_three', 'profession_four' ]);
+      // const newdata = _.pick(companyidentify, [ 'uid', 'company_name', 'introduction', 'registered_addr', 'business_addr', 'profession_one', 'profession_two', 'profession_three', 'profession_four' ]);
+      const newdata = _.pick(companyidentify, [ 'uid', 'company_name', 'reg_num', 'type', 'address', 'business', 'capital', 'establish_date', 'valid_period', 'person' ]);
       // 将企业用户表中的权限改为1(认证)
       const companyuser = await this.umodel.findById(companyidentify.uid);
       companyuser.roles = '1';