no message

src/biz/qyfw.ts

@@ -26,14 +26,15 @@ export async function getData(req, res) {
         Object.keys(info).forEach((key, index) => {
             dt[A].dataList.push({ key: dtTable.titleList[index], value: info[key] });
         })
-        dt[A].dataList.push({key:"入驻率", value:dbData.入驻率入驻企业[H].入驻率});
-        dt[A].dataList.push({key:"入驻企业", value:dbData.入驻率入驻企业[H].入驻企业});
-        
         let loudongTable = {dataList:[], titleList:["企业名称", "入孵时间", "孵化时长", "行业领域", "企业规模"]};
         let loudongDetails = dbData.明星企业列表;
         loudongTable.dataList = loudongDetails[H];
         dt[A].tableData = getTableOut("表格数据", loudongTable);
         // dt[A].tableData = getTableOut("表格数据", loudongDetails);
+        
+        dt[A].dataList.push({key:"入驻率", value:dbData.入驻率入驻企业[H].入驻率});
+        dt[A].dataList.push({key:"入驻企业", value:loudongDetails[H].length});
+        // dt[A].dataList.push({key:"入驻企业", value:dbData.入驻率入驻企业[H].入驻企业});
     });
 
     ret['dt'] = {title:"地图", dataList:dt};

src/biz/qyszhx.ts

@@ -5,8 +5,8 @@
 import { keyValuePackage, stringListPackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getKeyValueOut, getStringOut, getTableOut } from '../dataPackage/out';
 import { getQyszhx } from '../data/db/qyszhx';
-import { selectData } from '../data/db/operationalData';
-import { CHANGESTATE, INDUSTRY, OPERATIONALDATATYPE, TABLENAME } from '../config/enum';
+import { selectData, selectManyTableData } from '../data/db/operationalData';
+import { CHANGESTATE, FUHUASTATE, INDUSTRY, OPERATIONALDATATYPE, TABLENAME } from '../config/enum';
 
 
 export async function getData(req, res) {
@@ -123,8 +123,14 @@ export async function getPinyinName(req, res) {
     let selectParam = {state: CHANGESTATE.已通过};
     if (pinyinName) selectParam["pinyinName"] = {"%like%":pinyinName};
     if (industry) selectParam["industry"] = { "%like%": industry };
-    let dbList = await selectData(OPERATIONALDATATYPE.分页查询, TABLENAME.企业基础信息表, selectParam, ["eId", "enterpriseName"], page);
-    let dbCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业基础信息表, selectParam, null);
+    // let dbList = await selectData(OPERATIONALDATATYPE.分页查询, TABLENAME.企业基础信息表, selectParam, ["eId", "enterpriseName"], page);
+    // let dbCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业基础信息表, selectParam, null);
+
+    let manyTableInfo: any = {}
+    manyTableInfo[TABLENAME.企业孵化信息] = { column: ["fId", "eId", "startTime", "endTime", "state"], where: {state: { "%between%": [FUHUASTATE.实体孵化, FUHUASTATE.虚拟孵化] }} };
+    let dbList = await selectManyTableData(OPERATIONALDATATYPE.多表分页, TABLENAME.企业基础信息表, selectParam, ["industry", "enterpriseName", "eId"], manyTableInfo, page);
+    let dbCount = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, ["industry", "enterpriseName", "eId"], manyTableInfo);
+    
 
     let enterpriseNameList = [];
     dbList.forEach( info => {
@@ -132,7 +138,7 @@ export async function getPinyinName(req, res) {
     })
 
     ret['qymcList'] = enterpriseNameList;
-    ret['dataCount'] = dbCount;
+    ret['dataCount'] = dbCount.length;
     res.send(ret);
 }
 
@@ -161,10 +167,12 @@ export async function getIndustry(req, res) {
 
 export async function allEnterpriseNameList(req, res) {
     let ret: any = {};
-    let listList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业基础信息表, {state: CHANGESTATE.已通过}, ["enterpriseName", "eId"]);
+    let manyTableInfo: any = {}
+    manyTableInfo[TABLENAME.企业孵化信息] = { column: ["fId", "eId", "startTime", "endTime", "state"], where: {state: { "%between%": [FUHUASTATE.实体孵化, FUHUASTATE.虚拟孵化] }} };
+    let dbList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {state: CHANGESTATE.已通过}, ["enterpriseName", "eId"], manyTableInfo);
 
     let dataList = [];
-    listList.forEach(info => {
+    dbList.forEach(info => {
         dataList.push({
             key:info.enterpriseName,
             value:info.eId

src/biz/zhyy.ts

@@ -19,7 +19,7 @@ export async function getData(req, res) {
 
     let dtTable = tablePackage(dtExcelData["地图"].headerList[0], dtExcelData["地图"].bodyList);
     let dt = {}
-    dtTable.dataList.forEach(info => {
+    dtTable.dataList.forEach(info => { 
         let { A, D, H } = info;
         // let loudongDetails = tablePackage(dtExcelData[A].headerList[0], dtExcelData[A].bodyList);
         let imgUrl = `${systemConfig.imgPath}/${D}`;
@@ -28,14 +28,15 @@ export async function getData(req, res) {
         Object.keys(info).forEach((key, index) => {
             dt[A].dataList.push({ key: dtTable.titleList[index], value: info[key] });
         })
-        dt[A].dataList.push({key:"入驻率", value:dbData.入驻率入驻企业[H].入驻率});
-        dt[A].dataList.push({key:"入驻企业", value:dbData.入驻率入驻企业[H].入驻企业});
-        
         let loudongTable = {dataList:[], titleList:["企业名称", "入孵时间", "孵化时长", "行业领域", "企业规模"]};
         let loudongDetails = dbData.明星企业列表;
         loudongTable.dataList = loudongDetails[H];
         dt[A].tableData = getTableOut("表格数据", loudongTable);
         // dt[A].tableData = getTableOut("表格数据", loudongDetails);
+        
+        dt[A].dataList.push({key:"入驻率", value:dbData.入驻率入驻企业[H].入驻率});
+        dt[A].dataList.push({key:"入驻企业", value:loudongDetails[H].length});
+        // dt[A].dataList.push({key:"入驻企业", value:dbData.入驻率入驻企业[H].入驻企业});
     });
 
     ret['dt'] = { title: "地图", dataList: dt };
@@ -46,7 +47,7 @@ export async function getData(req, res) {
     let qymyd = keyValuePackage(excelData['服务成果'].dataList);
     ret['qymyd'] = getKeyValueOut('企业满意度', qymyd);
 
-    ret['nrzqy'] = { title: "拟入驻企业", dataList: excelData["拟入驻企业"].bodyList };
+    ret['nrzqy'] = { title: "拟入驻企业", dataList: dbData['拟入驻企业'] };
 
     ret['fhqgk'] = getKeyValueOut('孵化器概况', dbData['孵化器概况']);
 

src/config/enum.ts

@@ -288,8 +288,8 @@ export enum SEX {
  * 创始团队 
  */
 export enum ENTERPRISETEAM {
-    国际一流人才 = 2,
-    国内一流人才
+    海外人才 = 2,
+    国内人才
 }
 
 

src/data/db/out.ts

@@ -27,9 +27,9 @@ export async function get在孵企业面积() {
     let 雨艺孵化器dbList = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.羽翼孵化器, {}, []);
     let 孵化器总面积 = parseFloat(雨艺孵化器dbList.totalArea);
 
-    let zfqymjzb = ((在孵企业面积 / 孵化器总面积) * 100)
-    let 在孵企业面积占比 = "0%"
-    if (zfqymjzb >= 100) 在孵企业面积占比 = "100%"
+    let zfqymjzb = ((在孵企业面积 / 孵化器总面积) * 100);
+    let 在孵企业面积占比 = "0%";
+    if (zfqymjzb >= 100) 在孵企业面积占比 = "100%";
     else 在孵企业面积占比 = zfqymjzb.toFixed(2) + "%";
 
     return {孵化器总面积, 在孵企业面积, 在孵企业面积占比};
@@ -299,9 +299,9 @@ export async function get明星企业列表() {
     "moveOutTrace", "moveOutCause", "moveOutTime", "graduationTime", ];
     let 租赁Column = ["eId", "year", "alienPatent", "classIPatent", "secondClassPatent", "thirdPentent"];
     let 在孵租赁联查includeConf = {};
-    在孵租赁联查includeConf[TABLENAME.企业孵化信息] = { cloum: fhColumn, where: { "endTime": { "%gt%": nowTime } } };
+    在孵租赁联查includeConf[TABLENAME.企业孵化信息] = { cloum: fhColumn, where: { state: { "%between%": [FUHUASTATE.实体孵化, FUHUASTATE.虚拟孵化] } } };
     在孵租赁联查includeConf[TABLENAME.租赁信息] = { cloum: 租赁Column, where: {} }
-    let 在孵租赁联查dbList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {}, ["enterpriseName", "industry", "qiYeGuiMo"], 在孵租赁联查includeConf);
+    let 在孵租赁联查dbList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, { state: CHANGESTATE.已通过 }, ["enterpriseName", "industry", "qiYeGuiMo"], 在孵租赁联查includeConf);
 
     let 楼栋Map = {};
     在孵租赁联查dbList.forEach( info => {

src/data/db/qyszhx.ts

@@ -65,22 +65,22 @@ export async function getQyszhx(eId) {
     let ssgjejhy = {所属国际二级行业:企业科创分.subIndustry || ""};
     qyszhx.企业科创分.count = getKeyValue(ssgjejhy);
     //饼图
-    let qykcfChart = {占比:企业科创分.industryRanking || "0%", 等级:"", 星级:0};
-    let industryRanking = 0;
-    if (企业科创分.industryRanking) industryRanking = parseInt(企业科创分.industryRanking.split('%')[0]);
-    if (industryRanking >= 96 && industryRanking <= 100) {
+    let qykcfChart = {占比:企业科创分.score + "%" || "0%", 等级:"", 星级:0};
+    let score = 0;
+    if (企业科创分.score) score = parseInt(企业科创分.score);
+    if (score >= 96 && score <= 100) {
         qykcfChart.等级 = '卓越';
         qykcfChart.星级 = 5;
-    } else if (industryRanking >= 86 && industryRanking <= 95) {
+    } else if (score >= 86 && score <= 95) {
         qykcfChart.等级 = '优秀';
         qykcfChart.星级 = 4;
-    } else if (industryRanking >= 71 && industryRanking <= 85) {
+    } else if (score >= 71 && score <= 85) {
         qykcfChart.等级 = '良好';
         qykcfChart.星级 = 3;
-    } else if (industryRanking >= 51 && industryRanking <= 70) {
+    } else if (score >= 51 && score <= 70) {
         qykcfChart.等级 = '普通';
         qykcfChart.星级 = 2;
-    } else if (industryRanking >= 20 && industryRanking <= 50) {
+    } else if (score >= 20 && score <= 50) {
         qykcfChart.等级 = '入门';
         qykcfChart.星级 = 1;
     } else {
@@ -88,7 +88,7 @@ export async function getQyszhx(eId) {
     }
     qyszhx.企业科创分.chartData = getKeyValue(qykcfChart);
     //表格
-    let qykcf = {科创分:企业科创分.score || 0, 同行业内科创排名:企业科创分.industryRanking || 0};
+    let qykcf = {科创分:企业科创分.score || 0, 同行业内科创排名:企业科创分.industryRanking || "0%"};
     qyszhx.企业科创分.dataList = getKeyValue(qykcf);
 
     //股权结构
@@ -105,10 +105,13 @@ export async function getQyszhx(eId) {
     qyszhx.股权结构.dataList = gqjg.slice(0, 3);
 
     //资质认证
-    let 资质证书 = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.资质证书, {eId}, ["eId", "name", "type", "startDate", "status"]);
+    let 资质证书 = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.资质证书, {eId}, ["eId", "name", "type", "startDate", "status", "typeDesc"]);
     let zzzs = [];
     资质证书.forEach( info => {
-        zzzs.push([moment(info.startDate).format("YYYY-MM-DD"), info.name, info.status]);
+        let name = info.name || info.typeDesc;
+        let startTime = "-";
+        if (info.startDate) startTime = moment(info.startDate).format("YYYY-MM-DD");
+        zzzs.push([startTime, name, info.status]);
     })
     qyszhx.资质认证.count = [{key:"资质认证", value:资质证书.length}];
     qyszhx.资质认证.bodyList = zzzs;

src/data/db/zhyy.ts

 import moment = require("moment");
-import { BUILDING, FOLLOWUPSTATUS, FUHUASTATE, INDUSTRY, NEEDCATEGORY, OFFLINEPROMOTION, ONLINEPROMOTION, OPERATIONALDATATYPE, POLICYTYPE, PROMOTIONTYPE, TABLENAME } from "../../config/enum";
+import { BUILDING, CHANGESTATE, FOLLOWUPSTATUS, FUHUASTATE, INDUSTRY, NEEDCATEGORY, OFFLINEPROMOTION, ONLINEPROMOTION, OPERATIONALDATATYPE, POLICYTYPE, PROMOTIONTYPE, TABLENAME } from "../../config/enum";
 import { selectData, selectManyTableData } from "./operationalData";
 import { changeEnumValue } from "../../tools/eccEnum";
 import { getAll知识产权, getRecentQuarters, get在孵企业面积, get在孵企业面积变化趋势, get明星企业列表 } from "./out";
@@ -78,6 +78,7 @@ export async function getZhyy() {
         政策速递:[],
         政策速递详情:[],
         明星企业列表:{},
+        拟入驻企业:[],
     }
 
     let 入驻Map = {};
@@ -298,6 +299,16 @@ export async function getZhyy() {
 
     zhyy.明星企业列表 = await get明星企业列表();
 
+    let 拟入驻企业 = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业基础信息表, {}, []);
+    拟入驻企业.forEach( info => {
+        if (info.state == CHANGESTATE.未审核 && (info.register == CHANGESTATE.未审核 || info.register == CHANGESTATE.已驳回)) {
+            zhyy.拟入驻企业.push(info.enterpriseName);
+        }
+        if (info.register == CHANGESTATE.已通过 && (info.state == CHANGESTATE.未审核 || info.state == CHANGESTATE.已驳回)) {
+            zhyy.拟入驻企业.push(info.enterpriseName);
+        }
+    })
+
     return zhyy;
 }
 

src/data/table/qyfwData.ts

-
-import { planarArrDecollateForIndex, planarArrDeconstruct, planarArrForObjectList } from "../../dataPackage/planaryArrayAnalysis";
-import { onceSheetBecomeOfblockData } from "../../util/analysisExcel";
-
-function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList) {
-    let result = {};
-
-    for (let i = 0; i < blockDataList.length; i++) {
-        let {blockData, blockTitle} = blockDataList[i];
-        if (keyValueOrTitleList.indexOf(blockTitle) > -1) {
-            let titleList = titltListConfig[blockTitle] || [];
-            result[blockTitle] = planarArrForObjectList(blockData, 0, titleList);
-        }
-        else if (barChartList.indexOf(blockTitle) > -1) {
-            result[blockTitle] = planarArrDeconstruct(blockData);
-        }
-        else if (stringList.indexOf(blockTitle) > -1) result[blockTitle] = planarArrForObjectList(blockData);
-        else if (decollatePlanarList.indexOf(blockTitle) > -1) result[blockTitle] = planarArrDecollateForIndex(blockData);
-    }
-
-    return result;
-}
-
-export function qyfwTableData() {
-    
-    let blockDataList = onceSheetBecomeOfblockData('yuyiServer.xlsx', '企业服务');
-
-    let keyValueOrTitleList = ["企业基本情况","入孵时长分布","孵化企业行业领域占比","企业服务汇总数据","企业需求动态","企业变化情况","金融服务","在孵企业总营收","知识产权","知识产权饼图","企业资质分类"];//适配 饼图 键值以及需要多个key的
-    let barChartList = ["变化趋势分析","企业人才","变化趋势","本月融资企业","本月融资金额"]; //适配 柱状图 折线图 
-    let stringList = [];
-    let decollatePlanarList =["企业需求动态详细","地图","金融服务企业","知识产权详情","企业资质分类_小巨人","企业资质分类_高新企业","企业资质分类_专精特新","企业资质分类_小巨人培育"];//适配 表格
-    let titltListConfig = {};
-
-    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
-    return result;
-
-        
-}
\ No newline at end of file

src/data/table/qyszhxData.ts

-
-import { planarArrDecollateForIndex, planarArrDeconstruct, planarArrForObjectList } from "../../dataPackage/planaryArrayAnalysis";
-import { onceSheetBecomeOfblockData } from "../../util/analysisExcel";
-
-function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList) {
-    let result = {};
-
-    for (let i = 0; i < blockDataList.length; i++) {
-        let { blockData, blockTitle } = blockDataList[i];
-        if (keyValueOrTitleList.indexOf(blockTitle) > -1) {
-            let titleList = titltListConfig[blockTitle] || [];
-            result[blockTitle] = planarArrForObjectList(blockData, 0, titleList);
-        }
-        else if (barChartList.indexOf(blockTitle) > -1) {
-            result[blockTitle] = planarArrDeconstruct(blockData);
-        }
-        else if (stringList.indexOf(blockTitle) > -1) result[blockTitle] = planarArrForObjectList(blockData);
-        else if (decollatePlanarList.indexOf(blockTitle) > -1) result[blockTitle] = planarArrDecollateForIndex(blockData);
-    }
-
-    return result;
-}
-
-export function qyszhxTableData() {
-
-    let blockDataList = onceSheetBecomeOfblockData('yuyiServer.xlsx', '企业数字画像');
-
-    let keyValueOrTitleList = ["企业基本情况", "企业基本数据", "企业标签", "企业名称", "知识产权", "企业员工画像", "企业汇总数据", "营收情况", "服务需求", "服务记录", "园区通知", "园区活动", "资质认证", "研发占比", "荣誉资质", "风险预警", "风险预警详情"];//适配 饼图 键值以及需要多个key的
-    let barChartList = ["历年人才招聘情况", "营收变化趋势", "活动变化趋势分析", "资质认证变化趋势", "企业面积预警动态"]; //适配 柱状图 折线图  
-    let stringList = [];
-    let decollatePlanarList = ["小巨人", "高新企业", "专精特新", "企业动态", "服务记录_空间服务", "服务记录_工商服务", "服务记录_融资服务", "园区通知详情", "园区活动明细"];//适配 表格
-    let titltListConfig = {};
-
-    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
-    return result;
-}
-
-
-export function fxyjTableData() {
-
-    let blockDataList = onceSheetBecomeOfblockData('yuyiServer.xlsx', '风险预警');
-
-    let keyValueOrTitleList = ["风险预警",];//适配 饼图 键值以及需要多个key的
-    let barChartList = []; //适配 柱状图 折线图  
-    let stringList = [];
-    let decollatePlanarList = [];//适配 表格
-    let titltListConfig = {};
-
-    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
-    return result;
-}
-
-

src/data/table/zhyyData.ts

@@ -27,7 +27,7 @@ export function dtTableData() {
     let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
     let barChartList = []; //适配 柱状图 折线图 
     let stringList = [];
-    let decollatePlanarList =["地图", "一号楼", "三号楼", "四号楼"];//适配 表格
+    let decollatePlanarList =["地图"];//适配 表格
     let titltListConfig = {};
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);