Merge branch 'master' of http://123.207.147.179:8888/node_server/zjxcxServer

src/biz/enterprise/enterprise.ts

@@ -137,16 +137,16 @@ export async function deleteEnterpriseByUscc(uscc:string) {
 /**
  * 获取在孵企业信息列表
  * @param time 新注册时间/迁入时间
- * @param fuHuaQiUscc 孵化器统一信用代码 实际参数是所属孵化器
+ * @param belongToIncubator 所属孵化器 
  * @param industry 行业领域
  * @param isNaturalPersonHolding 自然人控股
  * @param page 页数
  * @returns 
  */
-export async function enterpriseList(time:number, fuHuaQiUscc:string, industry:number, isNaturalPersonHolding:boolean, page:number) {
+export async function enterpriseList(time:number, belongToIncubator:number, industry:number, isNaturalPersonHolding:boolean, page:number) {
     let selectParam:any = {};
     if (time) selectParam.logonTime = time; selectParam.timeOfImmigration = time;
-    if (fuHuaQiUscc) selectParam.fuHuaQiUscc = fuHuaQiUscc;
+    if (belongToIncubator) selectParam.belongToIncubator = belongToIncubator;
     if (industry) selectParam.industry = industry;
     if (isNaturalPersonHolding) selectParam.isNaturalPersonHolding = isNaturalPersonHolding;
 

src/biz/enterprise/financing.ts

@@ -125,7 +125,7 @@ export async function getFinancingByName(uscc:string) {
  * @param page 页数 
  * @returns 
  */
-export async function financingList(month:string, belongToIncubator:string, industry:string, fuHuaQiInvestment:boolean, page:number) {
+export async function financingList(month:string, belongToIncubator:number, industry:string, fuHuaQiInvestment:boolean, page:number) {
     let selectParam:any = {};
     if (month) selectParam.month = month;
     if (belongToIncubator) selectParam.belongToIncubator = belongToIncubator;

src/biz/fuHuqQi/month.ts

@@ -105,7 +105,7 @@ export async function monthTableList(state:number, year:number, month:number, pa
 
 
 /**
- * 根据uscc查询任务信息 
+ * 根据uscc查询月度报表 
  * @param uscc 企业统一信用代码
  */
  export async function getMonthByUscc(uscc:string) {

src/config/ojbectResultKeyConfig.ts

@@ -113,6 +113,5 @@ export const MonthListConfig = {
     name:{key:"任务名称"},
     fuHuaQiUscc:{key:"任务所属孵化器id"},
     occupancyRate:{key:"出租率"},
-    liaisonPhone:{key:"负责人"},
     createTime:{key:"创建时间"},
 }

src/data/enterprise/enterprise.ts

@@ -23,6 +23,7 @@ const enterpriseSchema = new Schema({
     leasedArea:Number,//租赁面积（平方米）
     draftLock:{type:Boolean, default:false},//草稿锁，true为提交之后，false为草稿
     createTime:Number,//录入时间
+    belongToIncubator:[Number],//所属孵化器 
 });
 
 var enterpriseModel;

src/data/fuHuaQi/fuhuaqi.ts

@@ -9,6 +9,7 @@
 
 import {Schema} from 'mongoose';
 import { baseDB } from '../../db/dbInit';
+import * as hatchingGroundData from './hatchingGround';
 
 const fuHuaQiSchema = new Schema({
     name: {type:String,index: true},//名称
@@ -21,15 +22,13 @@ const fuHuaQiSchema = new Schema({
     acreagePersonalUse:Number,//孵化器自用面积(㎡)
     lv:Number,//孵化器级别
     identificationTime:Number,//认定时间
-    industry:[Number],//领域
+    industry:[Number],//孵化领域
     institutionalNature:Number,//机构性质
     liaison:String,//联系人
     liaisonPhone:String,//联系电话
     personInCharge:String,//负责人
     personInChargePhone:String,//负责人联系电话
-    personInChargeAdd:String,//孵化场地地址
-    siteAcreage:Number,//孵化场地面积(㎡)
-    leasePrice:Number,//孵化场地出租单价
+    hatchingGround:{type:[hatchingGroundData.hatchingGroundSchema]},//经备案孵化场地
     /**登录相关 */
     pwd:String,//登录密码
     token:{type:String, index:true},