no message

src/biz/zhyy.ts

 
 import { systemConfig } from '../config/serverConfig';
+import { getZhyy } from '../data/db/zhyy';
 import { zhyyTableData } from '../data/table/zhyyData';
 import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out';
 
 /*                            智慧运营                    */
 
-export function getData(req, res) {
+export async function getData(req, res) {
     let excelData = zhyyTableData();
-
+    let dbData = await getZhyy();
+    for (let key in dbData) {
+        excelData[key] = dbData[key];
+    }
+    
     let ret:any = {};
 
     let yqgkPackageData = keyValuePackage(excelData['园区概况'].dataList);

src/data/db/zhyy.ts

@@ -16,7 +16,7 @@ export async function getZhyy() {
     //     企业服务类型:{dataList:[], titleList:['key', 'value']},
     // };
     
-    let fhColumn = ["industry"];
+    let fhColumn = ["industry", "eId"];
     //获取所有企业孵化信息
     
     let manyTableInfo:any = {}
@@ -27,6 +27,7 @@ export async function getZhyy() {
     //入驻企业变化趋势
     let industryMap = {};
     let ruZhuMap = {};
+    let ruZhuCount = 0;
     let areaCount = 0;
     let enterpriseCount = 0;
 
@@ -41,14 +42,18 @@ export async function getZhyy() {
             let timeStr = moment(startTime).format("YYYYMM");
             if (!ruZhuMap[timeStr]) ruZhuMap[timeStr] = 0;
             ruZhuMap[timeStr] += 1;
+            ruZhuCount += 1;
         }
         //行业领域分布
-        let industryStr = changeEnumValue(INDUSTRY, JSON.parse(industry)[0]);
-        if (!industryMap[industryStr])  industryMap = 0;
-        industryMap[industryStr] += 1;
+        if (industry) {
+            let industryStr = changeEnumValue(INDUSTRY, JSON.parse(industry)[0]);
+            if (!industryMap[industryStr])  industryMap[industryStr] = 0;
+            industryMap[industryStr] += 1;
+        }
+        
 
         let area = enterprise_leases[0].area || 0;
-        if (area) areaCount += area;
+        if (area) areaCount += parseFloat(area);
 
         enterpriseCount += 1;
 
@@ -67,6 +72,7 @@ export async function getZhyy() {
     }
 
     let biYeOutCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业孵化信息, {state:FUHUASTATE.迁出, moveOutType:MOVEOUTTYPE.毕业迁出}, null);
+    let qianChuCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业孵化信息, {state:FUHUASTATE.迁出}, null);
     let rongZiList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业融资, {}, null);
     let rongZiMap = {};
     rongZiList.forEach(info => {
@@ -104,20 +110,41 @@ export async function getZhyy() {
         });
     }
 
+    let 在孵企业数据 = [
+        {key:"在孵企业面积占比", value:"3%"},
+        {key:"入驻", value:`${ruZhuCount}家`},
+        {key:"迁出", value:`${qianChuCount}家`},
+        {key:"到期退租", value:"3家"},
+        {key:"违约退租", value:"10家"}
+    ];
+    let 孵化运营 = [
+        {key:"孵化面积", value:`${areaCount}㎡`},
+        {key:"在孵企业", value:`${ruZhuCount}家`},
+        {key:"毕业企业", value:`${biYeOutCount}家`},
+        {key:"融资企业", value:`${rongZiQiYeCount}家`},
+
+    ];
+    let 智慧运营汇总数据 = [
+        {key:"配套服务", value:`3项`},
+        {key:"第三方供应商", value:`3家`},
+        {key:"累计服务企业", value:`${fuWuQiYeCount}次`},
+    ];
+    let 企业服务 = [
+        {key:"服务数", value:fuWuCount},
+        {key:"服务覆盖企业", value:fuWuQiYeCount},
+
+    ];
     let zhyy = {
-        在孵企业数据:{dataList:[], titleList:['key', 'value']},
-        入驻企业变化趋势:[],
-        入驻企业行业类型:{dataList:[], titleList:['key', 'value']},
-        孵化运营:{dataList:[], titleList:['key', 'value']},
-        智慧运营汇总数据:{dataList:[], titleList:['key', 'value']},
-        企业服务:{dataList:[], titleList:['key', 'value']},
-        企业服务类型:{dataList:[], titleList:['key', 'value']},
+        在孵企业数据:{dataList:在孵企业数据, titleList:['key', 'value']},
+        入驻企业变化趋势:[{name:"入驻企业变化趋势",data:入驻企业变化趋势}],
+        入驻企业行业类型:{dataList:行业领域, titleList:['key', 'value']},
+        孵化运营:{dataList:孵化运营, titleList:['key', 'value']},
+        智慧运营汇总数据:{dataList:智慧运营汇总数据, titleList:['key', 'value']},
+        企业服务:{dataList:企业服务, titleList:['key', 'value']},
+        企业服务类型:{dataList:fuWuQiYeTypeList, titleList:['key', 'value']},
     }
 
 
-
-
-
     return zhyy;
 }