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

src/biz/enterprise/enterprise.ts

@@ -184,6 +184,7 @@ export async function enterpriseList(createType:number, fuHuaQiUscc:string, indu
     dataBaseList.forEach( info => {
         let changeData:any = extractData(EnterpriseListConfig, info);
         changeData.fuhuaqiUscc = usccMap[changeData.fuhuaqiUscc] || "";
+        (changeData.isCreate) ? changeData.isCreate = "新注册" : changeData.isCreate = "新迁入";
 
         changeData.industry = changeEnumValue(FUHUAINDUSTRY, changeData.industry);
         dataList.push(changeData);

src/biz/enterprise/financing.ts

@@ -10,11 +10,11 @@ import { EnterpriseFinancingInfoConfig } from "../../config/ojbectResultKeyConfi
 import { createFinancing, deleteEnterpriseFinancing, findFinancingCount, findFinancingInfoByTaskIdAndSucc, findFinancingList, findFinancingListToPage } from "../../data/enterprise/financing";
 import { FinancingListConfig } 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 { findEnterpriseInfoByName, findEnterpriseListByFuHuaQiUsccName } from "../../data/enterprise/enterprise";
 import { findFuHuaQiByName } from "../../data/fuHuaQi/fuhuaqi";
 import moment = require("moment");
-import { OUTPUTTYPE } from "../../config/enum";
+import { FUHUAINDUSTRY, OUTPUTTYPE } from "../../config/enum";
 
 
 /**
@@ -192,7 +192,9 @@ export async function financingList(monthData:string, fuHuaQiName:string, indust
     let count = await findFinancingCount(selectParam);
     let dataList = [];
     dataBaseList.forEach( info => {
-        let changeData = extractData(FinancingListConfig, info);
+        let changeData:any = extractData(FinancingListConfig, info);
+        
+        changeData.industry = changeEnumValue(FUHUAINDUSTRY, changeData.industry);
         dataList.push(changeData);
     });
 

src/config/ojbectResultKeyConfig.ts

@@ -62,7 +62,6 @@ export const EnterpriseFinancingInfoConfig = {
  export const EnterpriseListConfig = {
     name:{key:"企业 名称"},
     createTime:{key:"入库时间 不可修改", changeDate:true},
-    // 新注册/迁入
     fuhuaqiUscc:{key:"孵化器统一信用代码 不可修改 这里显示运营机构的名称"},
     uscc:{key:"统一信用代码 也是登录账号 不可修改"},
     industry:{key:"行业领域[] 最多 选择三个"},
@@ -74,12 +73,14 @@ export const EnterpriseFinancingInfoConfig = {
     logonAdd:{key:"注册地址"},
     operatingAdd:{key:"经营地址"},
     leasedArea:{key:"租赁面积（平方米）"},
+    isCreate:{key:"新注册/新迁入"}
 };
 
 /**
  * 企业融资信息 参数转换配置
  */
 export const FinancingListConfig = {
+    uscc:{key:"企业统一信用代码"},
     name:{key:"企业名称"},
     logonAdd:{key:"注册地址"},
     operatingAdd:{key:"经营地址"},
@@ -90,6 +91,7 @@ export const FinancingListConfig = {
     fuHuaQiInvestmentAmount:{key:"孵化器投资金额(万元)"},
     fuHuaQiInvestmentStyle:{key:"孵化器投资方式"},
     createTime:{key:"录入时间 不可修改", changeDate:true},
+    industry:{key:"行业领域[] 最多 选择三个"},
 }
 
 /**