no message

src/biz/zhyy.ts

@@ -20,7 +20,7 @@ export async function getData(req, res) {
     let dtTable = tablePackage(dtExcelData["地图"].headerList[0], dtExcelData["地图"].bodyList);
     let dt = {}
     dtTable.dataList.forEach(info => {
-        let { A, D } = info;
+        let { A, D, H } = info;
         let loudongDetails = tablePackage(dtExcelData[A].headerList[0], dtExcelData[A].bodyList);
         let imgUrl = `${systemConfig.imgPath}/${D}`;
         info["D"] = imgUrl;
@@ -28,6 +28,8 @@ 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].入驻企业});
         dt[A].tableData = getTableOut("表格数据", loudongDetails);
     });
 

src/config/enum.ts

@@ -54,7 +54,7 @@ export enum TABLENAME {
     对外投资 = "overseas_investment",
     运营推广信息表 = "info_operation_promotion",
     政策表 = "policy",
-    
+    入驻信息表 = "info_enter",
 }
 
 
@@ -414,7 +414,15 @@ export enum OFFLINEPROMOTION {
 }
 
 
-
+/**
+ * 园区楼号
+ */
+export enum BUILDING {
+    "1号楼" = 1,
+    "3号楼" = 3,
+    "4号楼" = 4,
+}
+    
 
 
 

src/data/db/qyfw.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { FUHUASTATE, INDUSTRY, OPERATIONALDATATYPE, TABLENAME, EMIGRATIONTYPE, NEEDCATEGORY, FOLLOWUPSTATUS } from "../../config/enum";
+import { FUHUASTATE, INDUSTRY, OPERATIONALDATATYPE, TABLENAME, EMIGRATIONTYPE, NEEDCATEGORY, FOLLOWUPSTATUS, BUILDING } from "../../config/enum";
 import { selectData, selectManyTableData } from "./operationalData";
 import { getChart, getKeyValue, getMonthList, getYearList, get在孵企业面积, get在孵企业面积变化趋势 } from "./out";
 import { changeEnumValue } from "../../tools/eccEnum";
@@ -20,6 +20,7 @@ function getStartAndEndTimeYearList(startTime, endTime) {
 
 export async function getEnterprise() {
     let qyfw = {
+        入驻率入驻企业:{},
         企业基本情况: { dataList: [], titleList: ['key', 'value'] }, // 在孵企业面积，在孵企业，毕业企业
         入孵企业数量变化趋势: [], // 入孵企业按月、按年的迁入、迁出数量
         入孵时长分布: { dataList: [], titleList: ['key', 'value'] },
@@ -34,6 +35,21 @@ export async function getEnterprise() {
         入孵企业服务情况: {}
     }
 
+    let 入驻Map = {};
+    for (let key in BUILDING) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            入驻Map[key] = {入驻率:"", 入驻企业:0};
+        }
+    }
+    let 入驻dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.入驻信息表, {}, ["building", "occupancyRate", "enteredEnterprises"]);
+    入驻dbList.forEach( info => {
+        let building = changeEnumValue(BUILDING, parseInt(info.building));
+        入驻Map[building].入驻率 = info.occupancyRate,
+        入驻Map[building].入驻企业 = info.enteredEnterprises
+    })
+    qyfw.入驻率入驻企业 = 入驻Map;
+
     let fhColumn = ["fId", "eId", "startTime", "endTime", "state", "virtualCause", "virtualCauseDes", "moveOutType",
         "moveOutTrace", "moveOutCause", "moveOutTime", "graduationTime", ];
     //获取所有企业孵化信息

src/data/db/zhyy.ts

 import moment = require("moment");
-import { FOLLOWUPSTATUS, FUHUASTATE, NEEDCATEGORY, OFFLINEPROMOTION, ONLINEPROMOTION, OPERATIONALDATATYPE, POLICYTYPE, PROMOTIONTYPE, TABLENAME } from "../../config/enum";
+import { BUILDING, FOLLOWUPSTATUS, FUHUASTATE, NEEDCATEGORY, OFFLINEPROMOTION, ONLINEPROMOTION, OPERATIONALDATATYPE, POLICYTYPE, PROMOTIONTYPE, TABLENAME } from "../../config/enum";
 import { selectData, selectManyTableData } from "./operationalData";
 import { changeEnumValue } from "../../tools/eccEnum";
 import { getRecentQuarters, get在孵企业面积, get在孵企业面积变化趋势 } from "./out";
@@ -59,6 +59,7 @@ function getQuarterRange(year: number, quarter: number) {
 
 export async function getZhyy() {
     let zhyy = {
+        入驻率入驻企业:{},
         孵化器概况:[],
         在孵企业面积占比:[],
         孵化运营:{ count:[], dataList:[] },
@@ -78,6 +79,21 @@ export async function getZhyy() {
         政策速递详情:[]
     }
 
+    let 入驻Map = {};
+    for (let key in BUILDING) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            入驻Map[key] = {入驻率:"", 入驻企业:0};
+        }
+    }
+    let 入驻dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.入驻信息表, {}, ["building", "occupancyRate", "enteredEnterprises"]);
+    入驻dbList.forEach( info => {
+        let building = changeEnumValue(BUILDING, parseInt(info.building));
+        入驻Map[building].入驻率 = info.occupancyRate,
+        入驻Map[building].入驻企业 = info.enteredEnterprises
+    })
+    zhyy.入驻率入驻企业 = 入驻Map;
+
     let {孵化器总面积, 在孵企业面积, 在孵企业面积占比} = await get在孵企业面积();
 
     //孵化器概况