no message

src/data/db/jxgljsc.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment")
-import { FUHUASTATE, OPERATIONALDATATYPE, TABLENAME, ENTERPRISETEAM, EMIGRATIONTYPE, STATE, FOLLOWUPSTATUS, NEEDCATEGORY } from "../../config/enum";
+import { FUHUASTATE, OPERATIONALDATATYPE, TABLENAME, ENTERPRISETEAM, EMIGRATIONTYPE, STATE, FOLLOWUPSTATUS, NEEDCATEGORY, CHANGESTATE } from "../../config/enum";
 import { selectData, selectManyTableData } from "./operationalData";
 import { getChart, getKeyValue, getMonthList, getYearList, get在孵企业面积, get在孵企业面积变化趋势 } from "./out";
 import { changeEnumValue } from "../../tools/eccEnum";
@@ -302,7 +302,7 @@ async function getyj() {
     // manyTableInfo[TABLENAME.企业孵化信息] = { column: ["fId", "eId", "startTime", "endTime", "state"], where: { state: FUHUASTATE.实体孵化 } };
     manyTableInfo[TABLENAME.企业孵化信息] = { column: ["fId", "eId", "moveOutTime", "moveOutType"], where: {} };
     // manyTableInfo[TABLENAME.企业经营信息] = { column: ["annual"], where: {} };
-    let fhdbList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {}, fhColumn, manyTableInfo);
+    let fhdbList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {state: CHANGESTATE.已通过}, fhColumn, manyTableInfo);
 
     let manageList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业经营信息, {}, ["annual", "eId"]);
 
@@ -318,15 +318,12 @@ async function getyj() {
         if (info.enterprise_fuhuas[0].moveOutType == EMIGRATIONTYPE.违约退租 || info.enterprise_fuhuas[0].moveOutType == EMIGRATIONTYPE.到期退租) {
             yj.高风险 += 1;
             riskLevel = "高风险";
+            riskEnterprises.push([info.enterpriseName, riskLevel]);
         } else if (!map[info.eId]) {
             yj.中低风险 += 1;
             riskLevel = "中低风险";
+            riskEnterprises.push([info.enterpriseName, riskLevel]);
         }
-
-        riskEnterprises.push([
-            info.enterpriseName,
-            riskLevel
-        ]);
     });
     return {
         yj,

src/data/db/qyfw.ts

@@ -369,8 +369,18 @@ async function getQyxqfw(企业服务dbList) {
 async function getRfqyfwqk(已受理企业服务dbList) {
     let needCategoryEnumLength = Object.keys(NEEDCATEGORY).filter(key => isNaN(Number(key))).length; // 过滤掉数字键（反向映射）
 
+    let month = getMonthList();
+    let rfqyfwqk = {"全部":{ chartList:[], tableData:{bodyList: [], headerList: [['服务企业名称', '服务时间', "负责人", "服务状态"]] }}};
     let fuWuQiYeTypeMap = {};//企业服务类型
     let fwxx = {};
+    for (let key in NEEDCATEGORY) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            rfqyfwqk[key] = { chartList:[], tableData:{bodyList: [], headerList: [['服务企业名称', '服务时间', "负责人", "服务状态"]] }};
+            fwxx[key] = [];
+        }
+    }
+    
     已受理企业服务dbList.forEach( info => {
         let needCategoryStr = changeEnumValue(NEEDCATEGORY, info.needCategory)
         if (!fuWuQiYeTypeMap[needCategoryStr]) {
@@ -392,8 +402,6 @@ async function getRfqyfwqk(已受理企业服务dbList) {
         ]
     };
 
-    let month = getMonthList();
-    let rfqyfwqk = {"全部":{ chartList:[], tableData:{bodyList: [], headerList: [['服务企业名称', '服务时间', "负责人", "服务状态"]] }}};
     let 全部 = {};
     for (let key in fwxx) {
         if (!rfqyfwqk[key]) rfqyfwqk[key] = { chartList:[], tableData:{bodyList: [], headerList: [['服务企业名称', '服务时间', "负责人", "服务状态"]] }};