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

# Conflicts:
#	src/biz/enterprise/enterprise.ts

src/biz/enterprise/enterprise.ts

@@ -8,12 +8,12 @@ import { MoveInEnterpriseParamConfig, RegisterEnterpriseParamConfig } from "../.
 import { ERRORENUM } from "../../config/errorEnum";
 import { EnterpriseInfoConfig } from "../../config/ojbectResultKeyConfig";
 import { BizError } from "../../util/bizError";
-import { checkChange, checkParamater, extractData, getTaskId } from "../../util/tools"
+import { changeEnumValue, checkChange, checkParamater, extractData, getTaskId } from "../../util/tools"
 import moment = require("moment");
 import { createEnterprise, deleteEnterprise,findEnterpriseCount, findEnterpriseByUscc, findEnterpriseListToPage, findEnterpriseListByFuHuaQiUsccName, 查询所有已绑定过的孵化器id, findEnterpriseList } from "../../data/enterprise/enterprise";
 import { EnterpriseListConfig } from "../../config/ojbectResultKeyConfig";
-import { findAllFuHuaQi, findAllFuHuaQiOperationNameMap, findFuHuaQiByUSCC } from "../../data/fuHuaQi/fuhuaqi";
-import { OUTPUTTYPE } from "../../config/enum";
+import { findAllFuHuaQi, findAllFuHuaQiOperationNameMap } from "../../data/fuHuaQi/fuhuaqi";
+import { FUHUAINDUSTRY, OUTPUTTYPE } from "../../config/enum";
 
 
 /**
@@ -184,6 +184,8 @@ export async function enterpriseList(createType:number, fuHuaQiUscc:string, indu
     dataBaseList.forEach( info => {
         let changeData:any = extractData(EnterpriseListConfig, info);
         changeData.fuhuaqiUscc = usccMap[changeData.fuhuaqiUscc] || "";
+
+        changeData.industry = changeEnumValue(FUHUAINDUSTRY, changeData.industry);
         dataList.push(changeData);
     });
 

src/config/ojbectResultKeyConfig.ts

@@ -35,7 +35,7 @@ export const EnterpriseInfoConfig = {
     logonAdd:{key:"注册地址"},//
     operatingAdd:{key:"经营地址"},//
     leasedArea:{key:"租赁面积（平方米）"},
-    timeOfImmigration:{key:"迁入时间"},//
+    timeOfImmigration:{key:"迁入时间", changeDate:true},//
     oldLogonAdd:{key:"迁入前注册地址"},//
 };
 
@@ -50,7 +50,7 @@ export const EnterpriseFinancingInfoConfig = {
     operatingAdd:{key:"经营地址"},//
     financingAmount:{key:"融资金额(万元)"},//
     investmentInstitutionsName:{key:"投资机构名称"},//
-    timeToObtainInvestment:{key:"获得投资时间"},//
+    timeToObtainInvestment:{key:"获得投资时间", changeDate:true},//
     fuHuaQiInvestment:{key:"孵化器是否投资"},
     fuHuaQiInvestmentAmount:{key:"孵化器投资金额(万元)"},//
     fuHuaQiInvestmentStyle:{key:"孵化器投资方式"},//
@@ -61,13 +61,13 @@ export const EnterpriseFinancingInfoConfig = {
  */
  export const EnterpriseListConfig = {
     name:{key:"企业 名称"},
-    createTime:{key:"入库时间 不可修改"},
+    createTime:{key:"入库时间 不可修改", changeDate:true},
     // 新注册/迁入
     fuhuaqiUscc:{key:"孵化器统一信用代码 不可修改 这里显示运营机构的名称"},
     uscc:{key:"统一信用代码 也是登录账号 不可修改"},
     industry:{key:"行业领域[] 最多 选择三个"},
     logonTime:{key:"注册时间", changeDate:true},
-    firstIncubationTime:{key:"首次入孵时间"},
+    firstIncubationTime:{key:"首次入孵时间", changeDate:true},
     timeOfImmigration:{key:"迁入时间", changeDate:true},
     isNaturalPersonHolding:{key:"是否自然人控股"},
     oldLogonAdd:{key:"迁入前注册地址"},
@@ -85,11 +85,11 @@ export const FinancingListConfig = {
     operatingAdd:{key:"经营地址"},
     financingAmount:{key:"融资金额(万元)"},
     investmentInstitutionsName:{key:"投资机构名称"},
-    timeToObtainInvestment:{key:"获得投资时间"},
+    timeToObtainInvestment:{key:"获得投资时间", changeDate:true},
     fuHuaQiInvestment:{key:"孵化器是否投资"},
     fuHuaQiInvestmentAmount:{key:"孵化器投资金额(万元)"},
     fuHuaQiInvestmentStyle:{key:"孵化器投资方式"},
-    createTime:{key:"录入时间 不可修改"},
+    createTime:{key:"录入时间 不可修改", changeDate:true},
 }
 
 /**
@@ -135,12 +135,12 @@ export const FuHuaQiBaseDataConfig = {
     operationName:{key:"运营机构名称"},
     uscc:{key:"统一信用代码"},
     virtualEnterpriseNum:{key:"虚拟企业数量"},
-    logonTime:{key:"注册时间"},
+    logonTime:{key:"注册时间", changeDate:true},
     incubatedAcreage:{key:"在孵面积"},
     acreageTotal:{key:"孵化器总面积"},
     acreagePersonalUse:{key:"/孵化器自用面积"},
     lv:{key:"孵化器级别"},
-    identificationTime:{key:"认定时间"},
+    identificationTime:{key:"认定时间", changeDate:true},
     industry:{key:"孵化领域"},
     institutionalNature:{key:"机构性质"},
     liaison:{key:"联系人"},