no message

src/biz/jxgljsc.ts

@@ -63,11 +63,15 @@ export async function getData(req, res) {
     let qycxfsddnlPackageData = keyValuePackage(excelData['区域创新辐射带动能力'].dataList);
     ret['qycxfsddnl'] = getKeyValueOut('区域创新辐射带动能力', qycxfsddnlPackageData);
 
-    let yjPackageData = keyValuePackage(excelData['预警'].dataList);//设计图有改动todo
+    // let yjPackageData = keyValuePackage(excelData['预警'].dataList);//设计图有改动todo
+    // ret['yj'] = getKeyValueOut('预警', yjPackageData);
+    let yjPackageData = keyValuePackage(dbList['预警'].dataList);
     ret['yj'] = getKeyValueOut('预警', yjPackageData);
 
-    let qyyjPackageData = keyValuePackage(excelData['企业预警'].dataList);
-    ret['qyyj'] = getKeyValueOut('企业预警', qyyjPackageData);
+    // let qyyjPackageData = keyValuePackage(excelData['企业预警'].dataList);
+    // ret['qyyj'] = getKeyValueOut('企业预警', qyyjPackageData);
+    let qyyjTableData = tablePackage(dbList["企业预警"].headerList[0], dbList["企业预警"].bodyList);
+    ret['qyyj'] = getTableOut('企业预警', qyyjTableData);
 
     let qydtPackageData = keyValuePackage(dbList['企业动态'].dataList);
     ret['qydt'] = getKeyValueOut('企业动态', qydtPackageData);

src/data/db/jxgljsc.ts

@@ -27,7 +27,9 @@ export async function getJxgljsc() {
         在孵企业融资情况: { dataList: [], titleList: ['key', 'value'] },//在孵企业融资情况
         在孵企业融资情况占比: { dataList: [], titleList: ['key', 'value'] },
         企业孵化数: { dataList: [], titleList: ['key', 'value'] },//企业孵化数
-        金融服务: { dataList: [], titleList: ['key', 'value'] }//新增后台填报
+        金融服务: { dataList: [], titleList: ['key', 'value'] },//新增后台填报
+        预警: { dataList: [], titleList: ['key', 'value'] },//预警
+        企业预警: {  bodyList: [], headerList: [['企业名称', '风险等级']] }
     };
 
     // 获取当前时间
@@ -59,11 +61,20 @@ export async function getJxgljsc() {
     jxgljsc.科技型中小企业认定情况.dataList = getKeyValue(kjxzxqyrdqk);
     //科技型中小企业认定情况详细列表
     jxgljsc.科技型中小企业认定情况详细.bodyList = kjxzxqyrdqkxx;
+    
 
 
     let fhqhzsjInfo = await fhqhzsj(羽翼孵化器dbList, 在孵dbList);
     jxgljsc.孵化器汇总数据.dataList = getKeyValue(fhqhzsjInfo);//孵化器汇总数据
 
+    /**
+     * 预警
+     */
+    let {yj,riskEnterprises} = await getyj();
+    jxgljsc.预警.dataList = getKeyValue(yj)
+    jxgljsc.企业预警.bodyList = riskEnterprises//企业预警
+    
+
     let qydtInfo = await qydt(在孵dbList);
     jxgljsc.企业动态.dataList = getKeyValue(qydtInfo);//企业动态
 
@@ -210,6 +221,55 @@ async function fhqhzsj(data, zfData) {
     return fhqhzsj;
 }
 
+
+/**
+ * 预警
+ */
+async function getyj() {
+
+    let yj = {
+        高风险: 0,
+        中低风险: 0,
+        关注: 0
+    }
+    let riskEnterprises: any[] = [];
+    let fhColumn = ["enterpriseName","industry", "eId","shijiaoziben"];
+    //获取所有企业孵化信息
+
+    let manyTableInfo: any = {}
+    // manyTableInfo[TABLENAME.企业孵化信息] = { column: ["fId", "eId", "startTime", "endTime", "state"], where: { state: FUHUASTATE.实体孵化 } };
+    manyTableInfo[TABLENAME.企业孵化信息] = { column: ["fId", "eId", "moveOutTime"], where: {} };
+    let fhdbList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {}, fhColumn, manyTableInfo);
+    fhdbList.forEach(info => {
+        let riskLevel: string;
+        if (info.enterprise_fuhuas[0].moveOutTime) {
+            yj.高风险++;
+            riskLevel = "高风险";
+        } else if (info.shijiaoziben == "-" || info.shijiaoziben == null) {
+            yj.中低风险++;
+            riskLevel = "中低风险";
+        }
+
+        riskEnterprises.push([
+            info.enterpriseName,
+            riskLevel
+        ]);
+    });
+    return {
+        yj,
+        riskEnterprises
+    };
+}
+
+
+/**
+ * 企业预警
+ */
+async function qyyj() {
+
+
+}
+
 /**
  * 企业动态---------
  */

src/data/db/qyszhx.ts

@@ -50,6 +50,8 @@ export async function getQyszhx(eId) {
     let 企业孵化联查includeConf = {};
     企业孵化联查includeConf[TABLENAME.企业孵化信息] = { cloum: 孵化Column, where: {} }
     let 企业孵化信息 = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, { eId }, [], 企业孵化联查includeConf);
+    console.log(企业孵化信息);
+    
 
     let 资质Column = ["qId", "eId", "kxTime", "zjtxTime", "xjrTime", "xjrPyTime", "goPublicTime", "gaoXinJiShuTime", "goPublicSector"];
     let 企业资质联查includeConf = {};

src/data/db/zhyy.ts

@@ -116,7 +116,9 @@ export async function getZhyy() {
 
     let firstDayMsOfMonth = moment().startOf('month').valueOf();
     let checlTimeMs = moment(firstDayMsOfMonth).subtract(8, 'months').valueOf();
+    // console.log("checlTimeMs", checlTimeMs);
     fhdbList.forEach(info => {
+        // console.log("info",info);
         let { industry, enterprise_fuhuas, enterprise_leases } = info;
         let startTime = enterprise_fuhuas[0].startTime;
         if (!startTime) return;
@@ -124,7 +126,12 @@ export async function getZhyy() {
         let startTimeMs = new Date(startTime).valueOf();
         if (startTimeMs >= checlTimeMs) {
             let timeStr = moment(startTime).format("YY/MM");
+            console.log("timeStr", timeStr);
+            
+            console.log(ruZhuMap[timeStr], "ruZhuMap[timeStr]");
             if (!ruZhuMap[timeStr]) ruZhuMap[timeStr] = 0;
+            
+
             ruZhuMap[timeStr] += 1;
             // ruZhuCount += 1;
         }
@@ -163,6 +170,8 @@ export async function getZhyy() {
     for (let key in ruZhuMap) {
         入驻企业变化趋势.push({ key, value: ruZhuMap[key] });
     }
+    console.log(入驻企业变化趋势);
+    
     // 入驻企业变化趋势.sort((a, b) => { return parseInt(a.key) - parseInt(b.key) });
     入驻企业变化趋势.sort((a, b) => {
         const dateA = moment(a.key, "YY/MM");