no message

src/biz/qyfw.ts

@@ -18,14 +18,16 @@ 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;
-        if (!dt[A]) dt[A] = {dataList:[], tableData:[]};
+        if (!dt[A]) dt[A] = { dataList: [], tableData: [] };
         Object.keys(info).forEach((key, index) => {
-            dt[A].dataList.push({key:dtTable.titleList[index], value:info[key]});
+            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

@@ -424,6 +424,18 @@ export enum BUILDING {
 }
 
 
+/**
+ * 入孵申请审批历史-审批状态
+ */
+ export enum CHANGESTATE {
+    未审核 = 0,//未审核
+    已驳回 = 1,//已驳回
+    // 重新提交 = 2,
+    已通过
+}
+
+    
+
 
 
 

src/data/db/jxgljsc.ts

@@ -130,10 +130,12 @@ export async function getJxgljsc() {
     let 已受理企业服务Count = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业服务表, {followUpStatus:{"%ne%":FOLLOWUPSTATUS.未受理}}, []);
     let 已完成企业服务Count = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业服务表, {followUpStatus:FOLLOWUPSTATUS.已完成}, []);
 
-    let 企业服务需求响应率 = ((已受理企业服务Count / 企业服务dbList.length) * 100).toFixed(2) + "%";
+    let 企业服务需求响应率 = "0%";
+    if (企业服务dbList.length) 企业服务需求响应率 = ((已受理企业服务Count / 企业服务dbList.length) * 100).toFixed(2) + "%";
     jxgljsc.企业服务需求响应率.dataList = [{key:"企业服务需求响应率", value:企业服务需求响应率}];
 
-    let 已响应需求处理进度 = ((已完成企业服务Count / 已受理企业服务Count) * 100).toFixed(2) + "%";
+    let 已响应需求处理进度 = "0%";
+    if (已受理企业服务Count) 已响应需求处理进度 = ((已完成企业服务Count / 已受理企业服务Count) * 100).toFixed(2) + "%";
     jxgljsc.已响应需求处理进度.dataList = [{key:"已响应需求处理进度", value:已响应需求处理进度}];
 
     jxgljsc.企业服务高需求类型排行趋势.dataList = await getRfqyfwqk(企业服务dbList);

src/data/db/out.ts

 import moment = require("moment");
-import { FUHUASTATE, INDUSTRY, OPERATIONALDATATYPE, TABLENAME } from "../../config/enum";
+import { CHANGESTATE, FUHUASTATE, INDUSTRY, OPERATIONALDATATYPE, TABLENAME } from "../../config/enum";
 import { selectData, selectManyTableData } from "./operationalData";
 import { changeEnumValue } from "../../tools/eccEnum";
 
@@ -37,7 +37,7 @@ export async function get在孵企业面积变化趋势() {
     let manyTableInfo: any = {}
     manyTableInfo[TABLENAME.企业孵化信息] = { column: ["fId", "eId", "startTime", "endTime", "state"], where: {} };
     manyTableInfo[TABLENAME.租赁信息] = { column: ["area", "startTime", "endTime"], where: {} };
-    let fhdbList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, { state: 1 }, ["industry", "eId"], manyTableInfo);
+    let fhdbList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, { state: CHANGESTATE.已通过 }, ["industry", "eId"], manyTableInfo);
 
     let areaCount = 0;
     let 面积变化Map = {};//孵化面积变化
@@ -66,10 +66,13 @@ export async function get在孵企业面积变化趋势() {
         }
         //行业领域分布
         if (industry) {
-            let industryStr = changeEnumValue(INDUSTRY, JSON.parse(industry)[0]);
+            let industryList = JSON.parse(industry);
+            for (let i = 0; i < industryList.length; i++) {
+                let industryStr = changeEnumValue(INDUSTRY, industryList[i]);
                 if (!industryMap[industryStr]) industryMap[industryStr] = 0;
                 industryMap[industryStr] += 1;
             }
+        }
 
     });
 

src/data/db/qyszhx.ts

@@ -184,8 +184,8 @@ export async function getQyszhx(eId) {
     qyszhx.科小.dataList = getKeyValue(kx);
     
     //贷款补贴
-    // let dkbt = get贷款补贴(企业资质信息);
-    // qyszhx.贷款补贴.dataList = getKeyValue(dkbt);
+    let dkbt = {占比: 0, 是否达标: "继续努力"};
+    qyszhx.贷款补贴.dataList = getKeyValue(dkbt);
 
     return qyszhx;
 }
@@ -495,9 +495,9 @@ function get融资情况(data) {
             let 融资日期 = moment(info.investmentDate);
             if (融资日期.isValid() && 融资日期.year() === year[i]) {
                 融资金额 += parseFloat(info.financingAmount || 0);
-            }
                 // 累加总融资金额
                 count.融资金额 += parseFloat(info.financingAmount || 0);
+            }
         });
         rzqk.push({key:year[i], value:融资金额});
     }
@@ -525,6 +525,11 @@ function get营收情况(data) {
         研发投入: [],
     }
 
+    data.sort((a, b) => 
+        moment(b.annual).year() - moment(a.annual).year() ||   // 年份倒序
+        b.quarter - a.quarter // 季度倒序
+    );
+    
     data.forEach(manage => {
         // ysqk.累计营收 += parseFloat(manage.BI);
         let thisAnnual = moment(manage.annual).year();

src/data/db/zhyy.ts

@@ -178,6 +178,7 @@ export async function getZhyy() {
         hzsj.企业总营收额 += parseFloat(BI);
         hzsj.企业纳税 += parseFloat(TXP);
     });
+
     zhyy.汇总数据 = getKeyValue(hzsj);
 
     //入孵企业就业情况
@@ -240,15 +241,15 @@ export async function getZhyy() {
             已受理服务类型统计次数[key] = 0;
         }
     }
-    let 服务成果 = {已办结:0, 待办结:0};
+    let 服务成果 = {已受理:0, 未受理:0};
     企业服务dbList.forEach( info => {
         let needCategory = changeEnumValue(NEEDCATEGORY, info.needCategory);
         if (info.followUpStatus != FOLLOWUPSTATUS.未受理) {
             已受理企业服务Map[info.eId] = 1;
             已受理服务类型统计次数[needCategory] += 1;
-            服务成果.待办结 += 1;
+            服务成果.已受理 += 1;
         } else {
-            服务成果.已办结 += 1;
+            服务成果.未受理 += 1;
         }
         服务类型统计次数[needCategory] += 1;
     })