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

src/biz/fuHuqQi/base.ts

@@ -4,12 +4,12 @@
  * 孵化器相关逻辑 包括孵化器的增删改查
  * 
  */
-import { BaseParamUpdateConfig } from "../../config/checkParamConfig";
+import { BaseParamUpdateConfig, OrganizationParamUpdateConfig } from "../../config/checkParamConfig";
 import { findEnterpriseCount, findEnterpriseCountByFuHuaQiUscc, groupFindEnterprise } from "../../data/enterprise/enterprise";
 import { findFuHuaQiByUSCC, findFuHuaQiCount, findFuHuaQiList, findFuHuaQiListByPage } from "../../data/fuHuaQi/fuhuaqi";
 import * as tools from "../../util/tools";
-import { FuHuaQiHomeDataConfig, FuHuaQiBaseListConfig, FuHuaQiBaseDataConfig } from "../../config/ojbectResultKeyConfig";
-import { FUHUAINDUSTRY, FUHUAQILNVESTMENTSTYLE, FUHUAQILV, INSTITUTIONALNATURE, OUTPUTTYPE } from "../../config/enum";
+import { FuHuaQiHomeDataConfig, FuHuaQiBaseListConfig, FuHuaQiBaseDataConfig, OrganizationBaseDataConfig } from "../../config/ojbectResultKeyConfig";
+import { DEGREE, FUHUAINDUSTRY, FUHUAQILNVESTMENTSTYLE, FUHUAQILV, INSTITUTIONALNATURE, OPERATIONMODEL, OUTPUTTYPE, SEX, TEAM } from "../../config/enum";
 import { extractData } from "../../util/tools";
 import { BizError } from "../../util/bizError";
 import { ERRORENUM } from "../../config/errorEnum";
@@ -56,6 +56,21 @@ export async function selectFuHuaQiBaseData(uscc:string) {
 
 
 /**
+ * 孵化器机构信息数据数据
+ * 小程序端  点击机构信息之后拉取的详细数据
+ * @param uscc 孵化器统一信用代码
+ * @returns data 基础数据字段
+ */
+export async function selectOrganizationInfo(uscc:string) {
+    let dataBaseInfo = await findFuHuaQiByUSCC(uscc);
+    
+    let data:any = extractData(OrganizationBaseDataConfig, dataBaseInfo, false);
+
+    return data;
+}
+
+
+/**
  * 更新孵化器基础数据
  * 小程序端
  * @param uscc 孵化器统一信用代码
@@ -64,8 +79,7 @@ export async function selectFuHuaQiBaseData(uscc:string) {
  */
 export async function updateFuHuaQiBaseData(uscc:string, param) {
     let skipKeyList = [
-        "name","virtualEnterpriseNum","logonTime","incubatedAcreage","acreageTotal","acreagePersonalUse", "lv", "identificationTime", 
-        "industry", "institutionalNature", "liaison", "liaisonPhone", "personInCharge", "personInChargePhone", "hatchingGround"
+        "virtualEnterpriseNum", "incubatedAcreage", "acreageTotal", "acreagePersonalUse", "hatchingGround"
     ];
     tools.checkParamater("更新孵化器基础数据", BaseParamUpdateConfig, param, skipKeyList);
 
@@ -81,12 +95,44 @@ export async function updateFuHuaQiBaseData(uscc:string, param) {
         }
     }
         
-    //todo  这里有个bug
+    /**这里无法判断数组里面的内容是否有变化 所以 hatchingGround 直接赋值  */
     let changeList = tools.checkChange(param, baseDataInfo);
     for (let i = 0; i < changeList.length; i++) {
         let key = changeList[i];
         baseDataInfo[key] = param[key];
     }
+    baseDataInfo["hatchingGround"] = param.hatchingGround;
+
+    await baseDataInfo.save();
+
+    return {isSuccess:true};
+}
+
+
+/**
+ * 更新孵化器机构信息数据
+ * 小程序端
+ * @param uscc 孵化器统一信用代码
+ * @param param 表单内容
+ * @returns {isSuccess:true/false};
+ */
+export async function updateOrganizationData(uscc:string, param) {
+    let skipKeyList = [
+        "virtualEnterpriseNum", "hatchingGround", "operationModelDes"//todo  写到这里了 这里和甘明讨论好哪些是必填的
+    ];
+    tools.checkParamater("更新孵化器基础数据", OrganizationParamUpdateConfig, param, skipKeyList);
+
+    let baseDataInfo = await findFuHuaQiByUSCC(uscc);
+        
+    /**这里无法判断数组里面的内容是否有变化 所以 hatchingGround 直接赋值  */
+    let changeList = tools.checkChange(param, baseDataInfo);
+    for (let i = 0; i < changeList.length; i++) {
+        let key = changeList[i];
+        if (key == "operationName" || key == "uscc") continue;
+        
+        baseDataInfo[key] = param[key];
+    }
+    baseDataInfo["foundingTeam"] = param.foundingTeam;
 
     await baseDataInfo.save();
 
@@ -135,6 +181,22 @@ export async function fuHuaQiBaseList(lv:number, institutionalNature:number, ind
         changeData.lv = tools.changeEnumValue(FUHUAQILV, changeData.lv);
         changeData.industry = tools.changeEnumValue(FUHUAINDUSTRY, changeData.industry);
         changeData.institutionalNature = tools.changeEnumValue(INSTITUTIONALNATURE, changeData.institutionalNature);
+        changeData.operationModel = tools.changeEnumValue(OPERATIONMODEL, changeData.operationModel);
+        if (changeData.operationModel == "_投资__孵化_类型"){
+            changeData.operationModel = changeData.operationModel.replace("__","+");
+            changeData.operationModel = changeData.operationModel.replace("_","+");
+        }
+
+        changeData.foundingTeamStr = "无";
+        if (changeData.foundingTeam && changeData.foundingTeam.length) {
+            changeData.foundingTeam.forEach(item => {
+                item.type = changeData(TEAM, item.type);//人才类型
+                item.memberSex = changeData(SEX, item.memberSex);//成员性别
+                item.memberDEGREE = changeData(DEGREE, item.memberDEGREE);//成员最高学历
+                /* 这里兼容了一下，团队类型数据库里存到了每一个人的信息里 以防后续要修改 */
+                changeData.foundingTeamStr = item.type;
+            });
+        }
 
         dataList.push(changeData);
     });
@@ -178,6 +240,19 @@ export async function outPutFuHuaQiBaseData(lv:number, institutionalNature:numbe
         changeData.lv = tools.changeEnumValue(FUHUAQILV, changeData.lv);
         changeData.industry = tools.changeEnumValue(FUHUAINDUSTRY, changeData.industry);
         changeData.institutionalNature = tools.changeEnumValue(INSTITUTIONALNATURE, changeData.institutionalNature);
+        changeData.operationModel = tools.changeEnumValue(OPERATIONMODEL, changeData.operationModel);
+        if (changeData.operationModel == "_投资__孵化_类型"){
+            changeData.operationModel = changeData.operationModel.replace("__","+");
+            changeData.operationModel = changeData.operationModel.replace("_","+");
+        }
+
+        if (changeData.foundingTeam && changeData.foundingTeam.length) {
+            changeData.foundingTeam.forEach(item => {
+                item.type = changeData(TEAM, item.type);//人才类型
+                item.memberSex = changeData(SEX, item.memberSex);//成员性别
+                item.memberDEGREE = changeData(DEGREE, item.memberDEGREE);//成员最高学历
+            });
+        }
 
         dataList.push(changeData);
     });

src/biz/fuHuqQi/user.ts

@@ -97,9 +97,13 @@ export async function changePassword(uscc:string, pwd:string, newPwd:string) {
  * @param uscc 信用代码
  * @returns {isSuccess:true/false}
  */
-export async function logout(uscc:string):Promise<object> {
+export async function logout(uscc:string){
     if (typeof uscc != "string") throw new BizError(ERRORENUM.参数错误, uscc);
     let fuhuaqiInfo = await fuhuaqiData.findFuHuaQiByUSCC(uscc);
+
+    fuhuaqiInfo.token = "";
+    fuhuaqiInfo.tokenMs = 0;
+
     await fuhuaqiInfo.save();
     return {isSuccess:true};
 }

src/config/checkParamConfig.ts

@@ -7,21 +7,32 @@
  * 更新孵化器基础数据的表单配置
  */
 export const BaseParamUpdateConfig = {
-    name:"String",
-    virtualEnterpriseNum:"Number",
-    logonTime:"Number",
-    incubatedAcreage:"Number",
-    acreageTotal:"Number",
-    acreagePersonalUse:"Number",
-    lv:"Number",
-    identificationTime:"Number",
-    industry:"[Number]",
-    institutionalNature:"Number",
-    liaison:"String",
-    liaisonPhone:"String",
-    personInCharge:"String",
-    personInChargePhone:"String",
-    hatchingGround:"[Object]",
+    virtualEnterpriseNum:"Number",//虚拟企业数量
+    incubatedAcreage:"Number",//在孵面积(㎡)
+    acreageTotal:"Number",//孵化器总面积(㎡)
+    acreagePersonalUse:"Number",//孵化器自用面积(㎡)
+    hatchingGround:"[Object]",//经备案孵化场地
+};
+
+/**
+ * 更新孵化器机构信息数据的表单配置
+ */
+export const OrganizationParamUpdateConfig = {
+    name:"String",// {key:"名称"},
+    operationName:"String",// {key:"运营机构名称"},
+    uscc:"String",// {key:"统一信用代码"},
+    logonTime:"Number",// {key:"注册时间", changeDate:true},
+    lv:"Number",// {key:"孵化器级别"},
+    identificationTime:"Number",// {key:"认定时间", changeDate:true},
+    industry:"[Number]",// {key:"孵化领域"},
+    institutionalNature:"Number",// {key:"机构性质"},
+    operationModel:"[Number]",// {key:"运营模式"},//新加
+    foundingTeam:"[Object]",// {key:"创始团队"},//新加
+    liaison:"String",// {key:"联系人"},
+    liaisonPhone:"String",// {key:"联系电话"},
+    personInCharge:"String",// {key:"负责人"},
+    personInChargePhone:"String",// {key:"负责人联系电话"},
+    operationModelDes:"String",//运营模式描述
 };
 
 
@@ -56,6 +67,7 @@ export const RegisterEnterpriseParamConfig = {
     logonAdd:"String",//注册地址
     operatingAdd:"String",//经营地址
     leasedArea:"Number",//租赁面积（平方米）
+    mainBusiness:"String",//主营业务
 };
 
 
@@ -74,6 +86,7 @@ export const MoveInEnterpriseParamConfig = {
     logonAdd:"String",//注册地址
     operatingAdd:"String",//经营地址
     leasedArea:"Number",//租赁面积（平方米）
+    mainBusiness:"String",//主营业务
 };
 
 
@@ -91,6 +104,7 @@ export const FinancingParamUpdateConfig = {
     fuHuaQiInvestment:"Boolean", //孵化器是否投资
     fuHuaQiInvestmentAmount:"Number",//孵化器投资金额(万元)
     fuHuaQiInvestmentStyle:"Number",//孵化器投资方式
+    financingRounds:"Number",//融资轮次
 };
 
 

src/config/enum.ts

@@ -12,11 +12,37 @@ export enum TASKTYPEENUM {
  * 孵化器级别
  */
 export enum FUHUAQILV {
-    国家级 = 1,
-    市级,
+    国家级众创空间 = 1,
+    市级众创空间,
+    国家级孵化器,
+    市级孵化器,
     区级
 }
 
+
+/**
+ * 孵化器创业团队
+ */
+export enum TEAM {
+    无 = 1,
+    国际一流人才,
+    国内一流人才
+}
+
+
+/**
+ * 运营模式
+ */
+export enum OPERATIONMODEL {
+    链接国际资源类型 = 1,
+    深挖科研创新资源类型,
+    _投资__孵化_类型,
+    搭建行业共性技术创新平台类型,
+    推动未来产业集聚类型,
+    其他,
+}
+
+
 /**
  * 孵化器机构性质
  */
@@ -40,11 +66,14 @@ export enum FUHUAQILNVESTMENTSTYLE {
  * 孵化器孵化领域
  */
 export enum FUHUAINDUSTRY{
-    综合型 = 1,
-    信息技术,
+    集成电路 = 1,
     生物医药,
-    集成电路,
-    人工智能,
+    人工智能及智能制造,
+    航空航天,
+    汽车产业,
+    软件和信息服务业,
+    低碳环保及新材料,
+    综合,
     文化创意
 }
 
@@ -52,13 +81,15 @@ export enum FUHUAINDUSTRY{
  * 行业领域
  */
 export enum INDUSTRY{
-    集成电路 =1,
+    集成电路 = 1,
     生物医药,
-    人工智能,
-    新材料及新能源,
-    信息技术,
-    文化创意,
-    其他
+    人工智能及智能制造,
+    航空航天,
+    汽车产业,
+    软件和信息服务业,
+    低碳环保及新材料,
+    综合,
+    文化创意
 }
 
 
@@ -87,3 +118,34 @@ export enum OUTPUTDATATYPE {
     在孵企业,
     融资企业
 }
+
+
+/**
+ * 最高学历
+ */
+export enum DEGREE {
+    本科 = 1,
+    硕士,
+    博士
+}
+
+/**
+ * 性别
+ */
+export enum SEX {
+    男 = 1,
+    女
+}
+
+
+/**
+ * 融资轮次
+ */
+export enum FINANCINGROUNDS {
+    种子轮 = 1,
+    天使投资,
+    A轮,
+    B轮,
+    C轮,
+    C轮以上,
+}

src/config/ojbectResultKeyConfig.ts

@@ -20,6 +20,8 @@ export const FuHuaQiBaseListConfig = {
     personInCharge:{key:"负责人"},
     personInChargePhone:{key:"负责人联系电话"},
     hatchingGround:{key:"经备案孵化场地"},
+    foundingTeam:{key:"创业团队"},
+    operationModel:{key:"运营模式"},
 };
 
 /**
@@ -37,6 +39,7 @@ export const EnterpriseInfoConfig = {
     leasedArea:{key:"租赁面积（平方米）"},
     timeOfImmigration:{key:"迁入时间", changeDate:true},//
     oldLogonAdd:{key:"迁入前注册地址"},//
+    mainBusiness:{key:"主营业务"},//主营业务
 };
 
 
@@ -73,7 +76,8 @@ export const EnterpriseFinancingInfoConfig = {
     logonAdd:{key:"注册地址"},
     operatingAdd:{key:"经营地址"},
     leasedArea:{key:"租赁面积（平方米）"},
-    isCreate:{key:"新注册/新迁入"}
+    isCreate:{key:"新注册/新迁入"},
+    mainBusiness:{key:"主营业务"},//主营业务
 };
 
 /**
@@ -92,7 +96,8 @@ export const FinancingListConfig = {
     fuHuaQiInvestmentStyle:{key:"孵化器投资方式"},
     createTime:{key:"录入时间 不可修改", changeDate:true},
     industry:{key:"行业领域[] 最多 选择三个"},
-    logonTime:{key:"注册时间", changeDate:true}
+    logonTime:{key:"注册时间", changeDate:true},
+    financingRounds:{key:"融资轮次"}
 }
 
 /**
@@ -134,21 +139,32 @@ export const FuHuaQiHomeDataConfig = {
  * 小程序孵化器详细数据
  */
 export const FuHuaQiBaseDataConfig = {
-    name:{key:"名称"},
-    operationName:{key:"运营机构名称"},
-    uscc:{key:"统一信用代码"},
     virtualEnterpriseNum:{key:"虚拟企业数量"},
-    logonTime:{key:"注册时间", changeDate:true},
     incubatedAcreage:{key:"在孵面积"},
     acreageTotal:{key:"孵化器总面积"},
     acreagePersonalUse:{key:"/孵化器自用面积"},
+    hatchingGround:{key:"经备案孵化场地"}
+}
+
+
+/**
+ * 机构信息
+ */
+export const OrganizationBaseDataConfig = {
+    name:{key:"名称"},
+    operationName:{key:"运营机构名称"},
+    uscc:{key:"统一信用代码"},
+    logonTime:{key:"注册时间", changeDate:true},
     lv:{key:"孵化器级别"},
     identificationTime:{key:"认定时间", changeDate:true},
     industry:{key:"孵化领域"},
     institutionalNature:{key:"机构性质"},
+    operationModel:{key:"运营模式"},//新加
+    foundingTeam:{key:"创始团队"},//新加
     liaison:{key:"联系人"},
     liaisonPhone:{key:"联系电话"},
     personInCharge:{key:"负责人"},
     personInChargePhone:{key:"负责人联系电话"},
-    hatchingGround:{key:"经备案孵化场地"}
+    operationModelDes:{key:"运营模式描述"}
+    // hatchingGround:{key:"经备案孵化场地"}
 }
\ No newline at end of file

src/data/enterprise/enterprise.ts

@@ -26,6 +26,7 @@ const enterpriseSchema = new Schema({
     createTime:Number,//录入时间
     enterpriseIsInPut:{type:Boolean, default:false},//是否是初始数据  todo 后续要弃用 兼容原始数据无法判断是否是迁入企业这个问题加的字段
     draftId:{type:String, index:true},//草稿id 编辑的时候使用这个id 保存之后就不认这个id了
+    mainBusiness:String,//主营业务
 });
 
 var enterpriseModel;

src/data/enterprise/financing.ts

@@ -24,6 +24,7 @@ const financingSchema = new Schema({
     createTime:Number,//录入时间
     industry:[Number],//领域
     logonTime:Number,//注册时间
+    financingRounds:Number,//融资轮次
 });
 
 var financingModel;

src/data/fuHuaQi/fuhuaqi.ts

@@ -10,12 +10,23 @@
 import {Schema} from 'mongoose';
 import { baseDB } from '../../db/mongo/dbInit';
 
+const foundingTeamSchema = new Schema({
+    type:Number,//人才类型
+    memberName:String,//成员姓名
+    memberSex:Number,//成员性别
+    memberAge:Number,//成员年龄
+    memberDEGREE:Number,//成员最高学历
+    memberSchool:String,//毕业学校
+    des:String,//履历描述
+});
+
 const hatchingGroundSchema = new Schema({
     personInChargeAdd:String,//孵化场地地址
     siteAcreage:Number,//孵化场地面积(㎡)
     leasePrice:Number,//孵化场地出租单价
 });
 
+
 const fuHuaQiSchema = new Schema({
     name: {type:String,index: true},//名称
     operationName:String,//运营机构名称  不可修改
@@ -34,6 +45,9 @@ const fuHuaQiSchema = new Schema({
     personInCharge:String,//负责人
     personInChargePhone:String,//负责人联系电话
     hatchingGround:{type:[hatchingGroundSchema], default:[] },//经备案孵化场地
+    foundingTeam:{type:[foundingTeamSchema], default:[]},//创业团队
+    operationModel:{type:[Number], default:[]},//运营模式
+    operationModelDes:String,//运营模式描述
     /**登录相关 */
     pwd:String,//登录密码
     token:{type:String, index:true},

src/routers/admin.ts

@@ -53,7 +53,13 @@ async function login(req, res) {
  * @param res 
  */
 async function fuHuaQiBaseList(req, res) {
-    let reqConf = {lv: 'Number', institutionalNature: 'Number', industry: 'Number', page: 'Number' };
+    let reqConf = {
+        lv: 'Number', 
+        institutionalNature: 'Number',//机构性质
+        operationModel:"Number",//运营模式
+        foundingTeam:"Number",//创业团队
+        industry: 'Number', page: 'Number' 
+    };
     let {lv, institutionalNature, industry, page} = checkParamaterType(reqConf, req.body);
     
     let result = await baseBiz.fuHuaQiBaseList(lv, institutionalNature, industry, page);

src/routers/fuhuaqi.ts

@@ -13,29 +13,28 @@ import { checkFuHuaQiToken } from '../middleware/user';
 
 export function setRouter(httpServer) {
     httpServer.post('/fuhuaqi/login', asyncHandler(login));
+    httpServer.post('/fuhuaqi/logout', checkFuHuaQiToken, asyncHandler(logout));
     httpServer.post('/fuhuaqi/login/firstupdate', checkFuHuaQiToken, asyncHandler(firstUpdatePwd));
-    
     /**基础数据 */
     httpServer.post('/fuhuaqi/base', checkFuHuaQiToken, asyncHandler(baseInfo));
     httpServer.post('/fuhuaqi/mydata', checkFuHuaQiToken, asyncHandler(myDataInfo));
     httpServer.post('/fuhuaqi/base/update', checkFuHuaQiToken, asyncHandler(updateMyDataInfo));
+    httpServer.post('/fuhuaqi/organization/info', checkFuHuaQiToken, asyncHandler(organizationInfo));//机构信息
+    httpServer.post('/fuhuaqi/organization/update', checkFuHuaQiToken, asyncHandler(updateOrganizationInfo));//修改机构信息
     /**任务 */
     httpServer.post('/fuhuaqi/task/list', checkFuHuaQiToken, asyncHandler(taskList));
     httpServer.post('/fuhuaqi/task/submit', checkFuHuaQiToken, asyncHandler(submitTask));
-    
     /**月度报表 */
     httpServer.post('/fuhuaqi/month/addreport', checkFuHuaQiToken, asyncHandler(addReport));
     httpServer.post('/fuhuaqi/month/updatereport', checkFuHuaQiToken, asyncHandler(updateReport));
     httpServer.post('/fuhuaqi/month/deletereport', checkFuHuaQiToken, asyncHandler(deleteReport));
     httpServer.post('/fuhuaqi/month/select', checkFuHuaQiToken, asyncHandler(selectMonthInfo));
-
     /**融资企业填报 */
     httpServer.post('/fuhuaqi/financing/create', checkFuHuaQiToken, asyncHandler(createFinancingInfo));
     httpServer.post('/fuhuaqi/financing/update', checkFuHuaQiToken, asyncHandler(updateFinancingInfo));
     httpServer.post('/fuhuaqi/financing/select', checkFuHuaQiToken, asyncHandler(selectEnterpriseFinancingInfo));
     httpServer.post('/fuhuaqi/financing/delete', checkFuHuaQiToken, asyncHandler(delEnterpriseFinancingInfo));
     httpServer.post('/admin/financing/namelist', checkFuHuaQiToken, asyncHandler(getFinancingInfoByName));
-
     /**新注册或迁入企业 */
     httpServer.post('/fuhuaqi/enterprise/register', checkFuHuaQiToken, asyncHandler(registerEnterprise));
     httpServer.post('/fuhuaqi/enterprise/updateregister', checkFuHuaQiToken, asyncHandler(updateRegisterEnterprise));
@@ -43,10 +42,46 @@ export function setRouter(httpServer) {
     httpServer.post('/fuhuaqi/enterprise/updatemove', checkFuHuaQiToken, asyncHandler(updateMoveInEnterprise));
     httpServer.post('/fuhuaqi/enterprise/select', checkFuHuaQiToken, asyncHandler(selectEnterpriseInfo));
     httpServer.post('/fuhuaqi/enterprise/delete', checkFuHuaQiToken, asyncHandler(delEnterpriseInfo));
+}
+
 
+/**
+ * 
+ */
+async function logout(req, res) {
+    const Uscc = req.headers.uscc;
+    let result = await userBiz.logout(Uscc);
+    res.success(result);
 }
 
 /**
+ * 机构信息
+ */
+async function organizationInfo(req, res) {
+    const Uscc = req.headers.uscc;
+
+    let userInfo = await baseBiz.selectOrganizationInfo(Uscc);
+
+    res.success(userInfo);
+}
+
+
+/**
+ * 修改机构信息
+ */
+async function updateOrganizationInfo(req, res) {
+    let reqConf = {form: 'Object' };
+    let { form } = checkReqParam(reqConf, req.body);
+    const Uscc = req.headers.uscc;
+
+    let result = await baseBiz.updateOrganizationData(Uscc, form);
+
+    res.success(result);
+    
+}
+
+
+/**
  * 创建企业融资信息 
  * @param req 
  * @param res 

src/routers/public.ts

@@ -3,7 +3,7 @@
  */
 
 import * as asyncHandler from 'express-async-handler';
-import { FUHUAQILV, INSTITUTIONALNATURE, FUHUAINDUSTRY, INDUSTRY, FUHUAQILNVESTMENTSTYLE } from '../config/enum';
+import { FUHUAQILV, INSTITUTIONALNATURE, FUHUAINDUSTRY, INDUSTRY, FUHUAQILNVESTMENTSTYLE, OPERATIONMODEL, TEAM, DEGREE, FINANCINGROUNDS } from '../config/enum';
 import { checkFuHuaQiToken } from '../middleware/user';
 
 export function setRouter(httpServer) {
@@ -12,8 +12,84 @@ export function setRouter(httpServer) {
     httpServer.post('/public/fuhuaqiindustry', asyncHandler(getFuHuaQiIndustry));
     httpServer.post('/public/industry', asyncHandler(getIndustry));
     httpServer.post('/public/investmentstyle', asyncHandler(getFuHuaQiInvestmentStyle));
+    httpServer.post('/public/operationmodel', asyncHandler(operationModel));
+    httpServer.post('/public/fuhuaqiteam', asyncHandler(fuHuaQiTeam));
+    httpServer.post('/public/degree', asyncHandler(degree));
+    httpServer.post('/public/financingrounds', asyncHandler(financingRounds));
 }
 
+
+/**
+ * 最高学历
+ * @param req 
+ * @param res 
+ */
+export function financingRounds(req, res) {
+    let financingRoundsList = [];
+    for (let key in FINANCINGROUNDS) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            financingRoundsList.push({key, value:FINANCINGROUNDS[key]});
+        }
+    }
+    res.success({financingRoundsList});
+}
+
+
+/**
+ * 最高学历
+ * @param req 
+ * @param res 
+ */
+export function degree(req, res) {
+    let degreeList = [];
+    for (let key in DEGREE) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            degreeList.push({key, value:DEGREE[key]});
+        }
+    }
+    res.success({degreeList});
+}
+
+/**
+ * 获取运营模式列表
+ * @param req 
+ * @param res 
+ */
+export function operationModel(req, res) {
+    let operationModelList = [];
+    for (let key in OPERATIONMODEL) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            if (parseInt(OPERATIONMODEL[key]) == OPERATIONMODEL._投资__孵化_类型) {
+                keyStr = keyStr.replace("__","+");
+                keyStr = keyStr.replace("_","+");
+            }
+            operationModelList.push({key:keyStr, value:OPERATIONMODEL[key]});
+        }
+    }
+    res.success({operationModelList});
+}
+
+/**
+ * 孵化器创业团队
+ * @param req 
+ * @param res 
+ */
+export function fuHuaQiTeam(req, res) {
+    let teamList = [];
+    for (let key in TEAM) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            teamList.push({key, value:TEAM[key]});
+        }
+    }
+    res.success({teamList});
+}
+
+
 /**
  * 获取孵化器等级列表
  * @param req 

src/util/dataInit.ts

@@ -7,39 +7,40 @@ const xlsx = require('node-xlsx');
 const path = require('path');
 
 const OldTypeChangeConfig = {
-    "文化创意":FUHUAINDUSTRY.文化创意,
-    "TMT":FUHUAINDUSTRY.文化创意,
-    "集成电路":FUHUAINDUSTRY.集成电路,
-    "微电子":FUHUAINDUSTRY.集成电路,
-    "先进制造":FUHUAINDUSTRY.集成电路,
-    "自动化":FUHUAINDUSTRY.集成电路,
-    "芯片半导体":FUHUAINDUSTRY.集成电路,
-    "电子商务":FUHUAINDUSTRY.综合型,
-    "物联网":FUHUAINDUSTRY.综合型,
-    "农业":FUHUAINDUSTRY.综合型,
-    "综合型":FUHUAINDUSTRY.综合型,
-    "区块链":FUHUAINDUSTRY.信息技术,
-    "电子信息":FUHUAINDUSTRY.信息技术,
-    "信息安全":FUHUAINDUSTRY.信息技术,
-    "新一代信息技术":FUHUAINDUSTRY.信息技术,
-    "互联网":FUHUAINDUSTRY.信息技术,
-    "高技术服务":FUHUAINDUSTRY.信息技术,
-    "大数据信息技术":FUHUAINDUSTRY.信息技术,
-    "技术研发":FUHUAINDUSTRY.信息技术,
-    "信息科技":FUHUAINDUSTRY.信息技术,
-    "软件":FUHUAINDUSTRY.信息技术,
-    "信息服务业":FUHUAINDUSTRY.信息技术,
-    "元宇宙":FUHUAINDUSTRY.信息技术,
-    "网络科技领域":FUHUAINDUSTRY.信息技术,
-    "IT计算机":FUHUAINDUSTRY.信息技术,
-    "工业4.0":FUHUAINDUSTRY.人工智能,
-    "人工智能大数据":FUHUAINDUSTRY.人工智能,
-    "智能制造":FUHUAINDUSTRY.人工智能,
-    "人工智能":FUHUAINDUSTRY.人工智能,
-    "生物医药":FUHUAINDUSTRY.生物医药,
-    "医疗器械":FUHUAINDUSTRY.生物医药,
-    "生物科技":FUHUAINDUSTRY.生物医药,
-    "大健康":FUHUAINDUSTRY.生物医药
+    "文化创意":INDUSTRY.文化创意,
+    "TMT":INDUSTRY.文化创意,
+    "集成电路":INDUSTRY.集成电路,
+    "微电子":INDUSTRY.集成电路,
+    "先进制造":INDUSTRY.集成电路,
+    "自动化":INDUSTRY.集成电路,
+    "芯片半导体":INDUSTRY.集成电路,
+    "电子商务":INDUSTRY.综合,
+    "物联网":INDUSTRY.综合,
+    "农业":INDUSTRY.综合,
+    "综合型":INDUSTRY.综合,
+    "区块链":INDUSTRY.软件和信息服务业,
+    "电子信息":INDUSTRY.软件和信息服务业,
+    "信息安全":INDUSTRY.软件和信息服务业,
+    "新一代信息技术":INDUSTRY.软件和信息服务业,
+    "互联网":INDUSTRY.软件和信息服务业,
+    "高技术服务":INDUSTRY.软件和信息服务业,
+    "大数据信息技术":INDUSTRY.软件和信息服务业,
+    "技术研发":INDUSTRY.软件和信息服务业,
+    "信息科技":INDUSTRY.软件和信息服务业,
+    "软件":INDUSTRY.软件和信息服务业,
+    "信息服务业":INDUSTRY.软件和信息服务业,
+    "元宇宙":INDUSTRY.软件和信息服务业,
+    "网络科技领域":INDUSTRY.软件和信息服务业,
+    "IT计算机":INDUSTRY.软件和信息服务业,
+    "工业4.0":INDUSTRY.人工智能及智能制造,
+    "人工智能大数据":INDUSTRY.人工智能及智能制造,
+    "智能制造":INDUSTRY.人工智能及智能制造,
+    "人工智能":INDUSTRY.人工智能及智能制造,
+    "生物医药":INDUSTRY.生物医药,
+    "医疗器械":INDUSTRY.生物医药,
+    "生物科技":INDUSTRY.生物医药,
+    "大健康":INDUSTRY.生物医药
+
 }
 
 /**
@@ -200,7 +201,7 @@ async function initEnterprise() {
                 if (item) {
                     let oldList = item.split(',');
                     oldList.forEach(oldStr => {
-                        let valueNum = INDUSTRY[oldStr.trim()];
+                        let valueNum = OldTypeChangeConfig[oldStr.trim()];
 
                         if (valueNum) value.push(valueNum);
                     });