no message

src/biz/enterprise/enterprise.ts

@@ -209,12 +209,13 @@ export async function enterpriseList(createType:number, fuHuaQiUscc:string, indu
  * 管理后台端
  * @param createType 新注册时间/迁入时间
  * @param fuHuaQiUscc 所属孵化器 
- * @param industry 行业领域
+ * @param industry 行业领域 数组
  * @param isNaturalPersonHolding 自然人控股
- * @returns dataList
+ * @returns 二维数组
  */
 export async function outPutEnterpriseData(createType:number, fuHuaQiUscc:string, industry, isNaturalPersonHolding:number, type:Number) {
-    let selectParam:any = {};
+
+    let selectParam:any = {}; //查询参数
     if (type == configEnum.OUTPUTTYPE.当前数据) {
         if (createType == 2 || createType == 3) {
             selectParam.isCreate = createType == 2 ? true : false;
@@ -225,9 +226,9 @@ export async function outPutEnterpriseData(createType:number, fuHuaQiUscc:string
             selectParam.isNaturalPersonHolding = isNaturalPersonHolding == 2 ? true : false;
         }
     }
+    selectParam.draftLock = true;//匹配已经提交入库的企业
     
     let usccMap = await fuHuaQiData.findAllFuHuaQiOperationNameMap();
-    selectParam.draftLock = true;
     let dataBaseList = await enterpriseData.findEnterpriseList(selectParam );
     let dataList = [];
     dataBaseList.forEach( info => {

src/config/ojbectResultKeyConfig.ts

@@ -26,6 +26,7 @@ export const FuHuaQiBaseListConfig = {
     hatchingGround:{key:"经备案孵化场地"},
     foundingTeam:{key:"创业团队"},
     operationModel:{key:"运营模式"},
+    foundingTeamType:{key:"创业团队类型"}
 };
 
 /**
@@ -61,6 +62,7 @@ export const EnterpriseFinancingInfoConfig = {
     fuHuaQiInvestment:{key:"孵化器是否投资"},
     fuHuaQiInvestmentAmount:{key:"孵化器投资金额(万元)"},//
     fuHuaQiInvestmentStyle:{key:"孵化器投资方式"},//
+    financingRounds:{key:"融资轮次"}
 };
 
 /**

src/data/enterprise/enterprise.ts

@@ -117,7 +117,7 @@ export async function findEnterpriseCountByFuHuaQiUscc(fuHuaQiUscc:string) {
  * 聚合查询 孵化器所拥有的企业数量
  * @returns {} key=孵化器统一信用 value=企业数量
  */
-export async function groupFindEnterprise() {
+export async function groupFindEnterpriseCount() {
     let match = {draftLock:true};//前置条件
     let dataList = await enterpriseModel.aggregate([{$match:match},{$group:{_id:"$fuHuaQiUscc",count:{$sum:1}}}]).exec();
     let result = {};

src/data/fuHuaQi/fuhuaqi.ts

@@ -46,7 +46,7 @@ const fuHuaQiSchema = new Schema({
     personInChargePhone:String,//负责人联系电话
     hatchingGround:{type:[hatchingGroundSchema], default:[] },//经备案孵化场地
     foundingTeam:{type:[foundingTeamSchema], default:[]},//创业团队
-    foundingTeamType:{type:Number, default:0},//创业团队类型
+    foundingTeamType:{type:Number, default:1},//创业团队类型
     operationModel:{type:[Number], default:[]},//运营模式
     operationModelDes:String,//运营模式描述
     /**登录相关 */

src/routers/admin/fuHuaQi.ts

@@ -103,10 +103,10 @@ async function addUser(req, res) {
 
 
 async function outPutFuHuaQiData(req, res) {
-    let reqConf = {lv: 'Number', institutionalNature: 'Number', industry: 'Number', dataType:'Number', type:'Number'};
-    let { lv, institutionalNature, industry, type } = eccReqNotMustHaveParam(reqConf, req.body);
+    let reqConf = { lv: 'Number',  institutionalNature: 'Number',  industry: 'Number', type:'Number', operationModel:"Number", foundingTeam:"Number" };
+    let { lv, institutionalNature, industry, type, operationModel, foundingTeam } = eccReqNotMustHaveParam(reqConf, req.body);
 
-    let dataList = await baseBiz.outPutFuHuaQiBaseData(lv, institutionalNature, industry, type);
+    let dataList = await baseBiz.outPutFuHuaQiBaseData(lv, institutionalNature, industry, operationModel, foundingTeam, type);
     
     let name = `孵化器列表${getTimeKey()}.xlsx`;
 

src/tools/dataInit.ts

@@ -218,7 +218,13 @@ async function initEnterprise() {
             if (i == 8 && item) {
                 value = new Date((item - 25569 ) * 86400 * 1000 + utc.getTimezoneOffset()*1000*60);
             }
-            if ([8,9,15, 18].indexOf(i) > -1 ) {
+            if (i == 9 && item) {
+                value = new Date((item - 25569 ) * 86400 * 1000 + utc.getTimezoneOffset()*1000*60);
+            }
+            if (i == 15 && item) {
+                value = new Date((item - 25569 ) * 86400 * 1000 + utc.getTimezoneOffset()*1000*60);
+            }
+            if ([18].indexOf(i) > -1 ) {
                 if(!item) value = 0;
                 else value = new Date(value).valueOf()
             } 

src/util/verificationEnum.ts

@@ -32,11 +32,25 @@ export function checkEnumValue(enumConf, value:any) {
 export function changeEnumValue(enumConf, value:any) {
     if (!value) return '';
     if ( typeof value == 'number' ) {
-        return enumConf[value];
+        let str = enumConf[value];
+        /** 特化处理 中文引号在枚举中不适用*/
+        if (str == "_投资__孵化_类型") {
+            str = str.replace("__","+");
+            str = str.replace("_","“");
+            str = str.replace("_","”");
+        }
+        return str
     }
     let str = "";
     value.forEach((item, index) => {
-        str += enumConf[item];
+        let subStr = enumConf[item];
+        /** 特化处理 中文引号在枚举中不适用*/
+        if (subStr == "_投资__孵化_类型") {
+            subStr = subStr.replace("__","+");
+            subStr = subStr.replace("_","“");
+            subStr = subStr.replace("_","”");
+        }
+        str += subStr;
         if (index == value.length-1) str+="";
         else str += ","
     });