no message

src/biz/jxgljsc.ts

@@ -19,6 +19,87 @@ export async function getData(req, res) {
     ret['zfqymjbhqs'] = getOnceYBarChartOut('在孵企业面积变化趋势', zfqymjbhqsPackageData);
     
                     
+    let cyjgPackageData = keyValuePackage(dbList['产业结构'].dataList);
+    ret['cyjg'] = getKeyValueOut('产业结构', cyjgPackageData);
+                    
+    let ykjqypyqkTableData = tablePackage(excelData["硬科技企业培育情况"].headerList[0], excelData["硬科技企业培育情况"].bodyList);
+    ret['ykjqypyqk'] = getTableOut( '硬科技企业培育情况', ykjqypyqkTableData);
+                    
+    let rcyjPackageData = keyValuePackage(dbList['人才引进'].dataList);
+    ret['rcyj'] = getKeyValueOut('人才引进', rcyjPackageData);
+                    
+    let fhqhzsjPackageData = keyValuePackage(dbList['孵化器汇总数据'].dataList);
+    ret['fhqhzsj'] = getKeyValueOut('孵化器汇总数据', fhqhzsjPackageData);
+                    
+    let xzzfqyqkPackageData = keyValuePackage(excelData['新增在孵企业情况'].dataList);
+    ret['xzzfqyqk'] = getKeyValueOut('新增在孵企业情况', xzzfqyqkPackageData);
+                    
+    let zyjjnlPackageData = keyValuePackage(excelData['资源集聚能力'].dataList);
+    ret['zyjjnl'] = getKeyValueOut('资源集聚能力', zyjjnlPackageData);
+                    
+    let zhnlPackageData = keyValuePackage(excelData['综合能力'].dataList);
+    ret['zhnl'] = getKeyValueOut('综合能力', zhnlPackageData);
+                    
+    let byqyqkPackageData = keyValuePackage(excelData['毕业企业情况'].dataList);
+    ret['byqyqk'] = getKeyValueOut('毕业企业情况', byqyqkPackageData);
+                    
+    let qycxfsddnlPackageData = keyValuePackage(excelData['区域创新辐射带动能力'].dataList);
+    ret['qycxfsddnl'] = getKeyValueOut('区域创新辐射带动能力', qycxfsddnlPackageData);
+                    
+    let yjPackageData = keyValuePackage(excelData['预警'].dataList);
+    ret['yj'] = getKeyValueOut('预警', yjPackageData);
+                    
+    let qyyjPackageData = keyValuePackage(excelData['企业预警'].dataList);
+    ret['qyyj'] = getKeyValueOut('企业预警', qyyjPackageData);
+                    
+    let qydtPackageData = keyValuePackage(dbList['企业动态'].dataList);
+    ret['qydt'] = getKeyValueOut('企业动态', qydtPackageData);
+                    
+    let zfqybhqsPackageData = onceYBarChartPackage( dbList['在孵企业变化趋势'], '家','');
+    ret['zfqybhqs'] = getOnceYBarChartOut('在孵企业变化趋势', zfqybhqsPackageData);
+                    
+    let jrfwPackageData = keyValuePackage(excelData['金融服务'].dataList);
+    ret['jrfw'] = getKeyValueOut('金融服务', jrfwPackageData);
+                    
+    let zysjePackageData = keyValuePackage(dbList['总营收金额'].dataList);
+    ret['zysje'] = getKeyValueOut('总营收金额', zysjePackageData);
+                    
+    let zfqyzysPackageData = keyValuePackage(dbList['在孵企业总营收'].dataList);
+    ret['zfqyzys'] = getKeyValueOut('在孵企业总营收', zfqyzysPackageData);
+                    
+    let tzlxPackageData = keyValuePackage(excelData['投资类型'].dataList);
+    ret['tzlx'] = getKeyValueOut('投资类型', tzlxPackageData);
+                    
+    let zfqyrzqkPackageData = keyValuePackage(dbList['在孵企业融资情况'].dataList);
+    ret['zfqyrzqk'] = getKeyValueOut('在孵企业融资情况', zfqyrzqkPackageData);
+                    
+    let ggjsfwPackageData = keyValuePackage(excelData['公共技术服务'].dataList);
+    ret['ggjsfw'] = getKeyValueOut('公共技术服务', ggjsfwPackageData);
+                    
+    let qyfhlPackageData = keyValuePackage(excelData['企业孵化率'].dataList);
+    ret['qyfhl'] = getKeyValueOut('企业孵化率', qyfhlPackageData);
+                    
+    let qyfhsPackageData = keyValuePackage(dbList['企业孵化数'].dataList);
+    ret['qyfhs'] = getKeyValueOut('企业孵化数', qyfhsPackageData);
+                     
+    res.send(ret);
+}
+
+
+
+export async function get备份(req, res) {
+    let dbList = await getJxgljsc();
+    let excelData = jxgljscTableData();
+
+    let ret:any = {};
+
+    let zfqymjqkfxPackageData = keyValuePackage(excelData['在孵企业面积情况分析'].dataList);
+    ret['zfqymjqkfx'] = getKeyValueOut('在孵企业面积情况分析', zfqymjqkfxPackageData);
+          
+    let zfqymjbhqsPackageData = onceYBarChartPackage( excelData['在孵企业面积变化趋势'], '','');
+    ret['zfqymjbhqs'] = getOnceYBarChartOut('在孵企业面积变化趋势', zfqymjbhqsPackageData);
+    
+                    
     let cyjgPackageData = keyValuePackage(excelData['产业结构'].dataList);
     ret['cyjg'] = getKeyValueOut('产业结构', cyjgPackageData);
                     
@@ -84,3 +165,5 @@ export async function getData(req, res) {
                      
     res.send(ret);
 } 
+
+

src/biz/qyfw.ts

@@ -13,6 +13,106 @@ export async function getData(req, res) {
 
     let ret:any = {};
 
+    let qyjbqkPackageData = keyValuePackage(dbData['企业基本情况'].dataList);
+    ret['qyjbqk'] = getKeyValueOut('企业基本情况', qyjbqkPackageData);
+                    
+    let bhqsfxPackageData = onceYBarChartPackage( excelData['变化趋势分析'], '','');
+    ret['bhqsfx'] = getOnceYBarChartOut('变化趋势分析', bhqsfxPackageData);
+                    
+    let rfszfbPackageData = keyValuePackage(dbData['入孵时长分布'].dataList);
+    ret['rfszfb'] = getKeyValueOut('入孵时长分布', rfszfbPackageData);
+                    
+    let fhqyhylyzbPackageData = keyValuePackage(dbData['孵化企业行业领域占比'].dataList);
+    ret['fhqyhylyzb'] = getKeyValueOut('孵化企业行业领域占比', fhqyhylyzbPackageData);
+                    
+    let qyrcPackageData = onceYBarChartPackage( excelData['企业人才'], '','');
+    ret['qyrc'] = getOnceYBarChartOut('企业人才', qyrcPackageData);
+                    
+    let qyfwhzsjPackageData = keyValuePackage(dbData['企业服务汇总数据'].dataList);
+    ret['qyfwhzsj'] = getKeyValueOut('企业服务汇总数据', qyfwhzsjPackageData);
+                    
+    let qyxqdtPackageData = keyValuePackage(dbData['企业需求动态'].dataList);
+    ret['qyxqdt'] = getKeyValueOut('企业需求动态', qyxqdtPackageData);
+                    
+    // let qyxqdtxxTableData = tablePackage(excelData["企业需求动态详细"].headerList[0], excelData["企业需求动态详细"].bodyList);
+    
+    // let itemDataList = []
+    // qyxqdtxxTableData.dataList.forEach(info => {
+    //     info.eId = "xxxx";
+    //     itemDataList.push(info);
+    // });
+    // qyxqdtxxTableData.dataList = itemDataList;
+    // ret['qyxqdtxx'] = getTableOut( '企业需求动态详细', qyxqdtxxTableData);
+    
+    let qyxqdtxxTableData = tablePackage(dbData["企业需求动态详细"].headerList[0], dbData["企业需求动态详细"].bodyList);
+    ret['qyxqdtxx'] = getTableOut( '企业需求动态详细', qyxqdtxxTableData);
+                    
+    let dtTableData = tablePackage(excelData["地图"].headerList[0], excelData["地图"].bodyList);
+    let dt = {dataList:[], titleList:dtTableData.titleList};
+    dtTableData.dataList.forEach(info => {
+        let {D} = info;
+        let imgUrl = `${systemConfig.imgPath}/${D}`;
+        info["D"] = imgUrl;
+        dt.dataList.push(info);
+    })
+    ret['dt'] = getTableOut( '地图', dt);
+                    
+    let qybhqkPackageData = keyValuePackage(dbData['企业变化情况'].dataList);
+    ret['qybhqk'] = getKeyValueOut('企业变化情况', qybhqkPackageData);
+                    
+    let bhqsPackageData = onceYBarChartPackage( dbData['企业变化情况变化趋势'], '家','');
+    ret['bhqs'] = getOnceYBarChartOut('变化趋势', bhqsPackageData);
+                    
+    let jrfwPackageData = keyValuePackage(dbData['金融服务'].dataList);
+    ret['jrfw'] = getKeyValueOut('金融服务', jrfwPackageData);
+                    
+    let byrzqyPackageData = onceYBarChartPackage( dbData['本月融资企业'], '','');
+    ret['byrzqy'] = getOnceYBarChartOut('本月融资企业', byrzqyPackageData);
+                    
+    let byrzjePackageData = onceYBarChartPackage( dbData['本月融资金额'], '','');
+    ret['byrzje'] = getOnceYBarChartOut('本月融资金额', byrzjePackageData);
+                    
+    let zfqyzysPackageData = keyValuePackage(dbData['在孵企业总营收'].dataList);
+    ret['zfqyzys'] = getKeyValueOut('在孵企业总营收', zfqyzysPackageData);
+                    
+    let jrfwqyTableData = tablePackage(dbData["金融服务企业"].headerList[0], dbData["金融服务企业"].bodyList);
+    ret['jrfwqy'] = getTableOut( '金融服务企业', jrfwqyTableData);
+                    
+    let zscqPackageData = keyValuePackage(dbData['知识产权'].dataList);
+    ret['zscq'] = getKeyValueOut('知识产权', zscqPackageData);
+                    
+    let zscqbtPackageData = keyValuePackage(dbData['知识产权饼图'].dataList);
+    ret['zscqbt'] = getKeyValueOut('知识产权饼图', zscqbtPackageData);
+                    
+    let zscqxqTableData = tablePackage(dbData["知识产权详情"].headerList[0], dbData["知识产权详情"].bodyList);
+    ret['zscqxq'] = getTableOut( '知识产权详情', zscqxqTableData);
+                    
+    let qyzzflPackageData = keyValuePackage(dbData['企业资质分类'].dataList);
+    ret['qyzzfl'] = getKeyValueOut('企业资质分类', qyzzflPackageData);
+                    
+    let qyzzfl_xjrTableData = tablePackage(dbData["企业资质分类_小巨人"].headerList[0], dbData["企业资质分类_小巨人"].bodyList);
+    ret['qyzzfl_xjr'] = getTableOut( '企业资质分类_小巨人', qyzzfl_xjrTableData);
+                    
+    let qyzzfl_gxqyTableData = tablePackage(dbData["企业资质分类_高新企业"].headerList[0], dbData["企业资质分类_高新企业"].bodyList);
+    ret['qyzzfl_gxqy'] = getTableOut( '企业资质分类_高新企业', qyzzfl_gxqyTableData);
+                    
+    let qyzzfl_zjtxTableData = tablePackage(dbData["企业资质分类_专精特新"].headerList[0], dbData["企业资质分类_专精特新"].bodyList);
+    ret['qyzzfl_zjtx'] = getTableOut( '企业资质分类_专精特新', qyzzfl_zjtxTableData);
+                    
+    let qyzzfl_gqpyTableData = tablePackage(dbData["企业资质分类_小巨人培育"].headerList[0], dbData["企业资质分类_小巨人培育"].bodyList);
+    ret['qyzzfl_gqpy'] = getTableOut( '企业资质分类_小巨人培育', qyzzfl_gqpyTableData);
+                     
+    res.send(ret);
+} 
+
+
+
+export async function get备份(req, res) {
+    let dbData = await getEnterprise();
+    let excelData = qyfwTableData();
+
+    let ret:any = {};
+
     let qyjbqkPackageData = keyValuePackage(excelData['企业基本情况'].dataList);
     ret['qyjbqk'] = getKeyValueOut('企业基本情况', qyjbqkPackageData);
                     
@@ -104,3 +204,5 @@ export async function getData(req, res) {
                      
     res.send(ret);
 } 
+
+

src/config/enum.ts

@@ -25,6 +25,7 @@ export enum OPERATIONALDATATYPE {
  * 表名
  */
 export enum TABLENAME {
+    羽翼孵化器='system_yuyi',
     企业孵化信息='enterprise_fuhua',
     租赁信息='enterprise_lease',
     企业用户表='enterprise_user', 

src/data/db/qyfw.ts

@@ -26,12 +26,12 @@ export async function getEnterprise() {
         金融服务企业:{bodyList:[], headerList:[['企业名称', '融资金额', '融资时间']]}, //金融服务企业 todo
         知识产权:{dataList:[], titleList:['key', 'value']}, //知识产权
         知识产权饼图:{dataList:[], titleList:['key', 'value']}, //知识产权饼图
-        知识产权详情:{bodyList:[], headerList:[['企业名称', '专利数量', '企业需求']]}, //知识产权详情
+        知识产权详情:{bodyList:[], headerList:[['企业名称', '专利数量', '企业需求']]}, //知识产权详情 todo
         企业资质分类:{dataList:[], titleList:['key', 'value']}, //企业资质分类
         企业资质分类_小巨人:{bodyList:[], headerList:[['企业名称', '资质类型']]}, //企业资质分类_小巨人
         企业资质分类_高新企业:{bodyList:[], headerList:[['企业名称', '资质类型']]}, //企业资质分类_高新企业
         企业资质分类_专精特新:{bodyList:[], headerList:[['企业名称', '资质类型']]}, //企业资质分类_专精特新
-        企业资质分类_高企培育:{bodyList:[], headerList:[['企业名称', '资质类型']]}, //企业资质分类_高企培育
+        企业资质分类_小巨人培育:{bodyList:[], headerList:[['企业名称', '资质类型']]}, //企业资质分类_小巨人培育
     }
 
     let nowTime = new Date().valueOf();
@@ -140,21 +140,25 @@ export async function getEnterprise() {
     qyfw.知识产权.dataList = getKeyValue(zscq);
     qyfw.知识产权饼图.dataList = getKeyValue(zscqbt);
 
-    //知识产权详情 专利数据和服务数据没法保持一致，不知道要怎么样实现在一个表格展现
+    //知识产权详情 专利数据和服务数据没法保持一致，不知道要怎么样实现在一个表格展现 todo
     let 专利Column = ["eId", "year", "alienPatent", "classIPatent", "secondClassPatent", "thirdPentent"];
     let 知识产权联查includeConf = {};
     知识产权联查includeConf[TABLENAME.企业专利表] = {cloum:专利Column, where:{}}
     知识产权联查includeConf[TABLENAME.企业服务表] = {cloum:["needContent"], where:{}}
     let 知识产权详情dbList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {}, ["enterpriseName"], 知识产权联查includeConf);
-    let zscqxq = await getZscqxq(知识产权详情dbList)
+    let zscqxq = await getZscqxq(知识产权详情dbList);
 
     //企业资质分类
-    let 企业资质Column = ["qId", "eId", "kxTime", "zjtxTime", "xjrTime", "xjrPyTime", "goPublicTime", "gaoXinJiShuTime", "goPublicSector"];
+    let 资质Column = ["qId", "eId", "kxTime", "zjtxTime", "xjrTime", "xjrPyTime", "goPublicTime", "gaoXinJiShuTime", "goPublicSector"];
     let 企业资质联查includeConf = {};
-    企业资质联查includeConf[TABLENAME.企业基础信息表] = {cloum:["enterpriseName"], where:{}}
-    let 企业资质dbList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业资质, {}, 企业资质Column, 融资企业联查includeConf);
-    let qyzzfl = getQyzzfl();
-    let qyzzfl_xjr = getQyzzfl();
+    企业资质联查includeConf[TABLENAME.企业资质] = {cloum:资质Column, where:{}}
+    let 企业资质dbList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {}, [], 企业资质联查includeConf);
+    let {qyzzfl, qyzzflTable} = getQyzzfl(企业资质dbList);
+    qyfw.企业资质分类.dataList = getKeyValue(qyzzfl);
+    qyfw.企业资质分类_小巨人.bodyList = qyzzflTable.小巨人;
+    qyfw.企业资质分类_高新企业.bodyList = qyzzflTable.高新企业;
+    qyfw.企业资质分类_专精特新.bodyList = qyzzflTable.专精特新;
+    qyfw.企业资质分类_小巨人培育.bodyList = qyzzflTable.小巨人培育;
 
     return qyfw;
 }
@@ -225,21 +229,21 @@ async function getQyfwhzsj() {
     };
     let 经营信息dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业经营信息, {}, null);
     经营信息dbList.forEach( info => {
-        qyfwhzsj.企业总营收额 += info.BI;
-        qyfwhzsj.企业纳税 += info.TXP;
+        qyfwhzsj.企业总营收额 += parseFloat(info.BI);
+        qyfwhzsj.企业纳税 += parseFloat(info.TXP);
     })
 
     let 企业融资dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业融资, {}, null);
     企业融资dbList.forEach( info => {
-        qyfwhzsj.融资企业 += info.financingAmount;
+        qyfwhzsj.融资企业 += parseFloat(info.financingAmount);
     })
 
     let 企业专利dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业专利表, {}, null);
     企业专利dbList.forEach( info => {
-        qyfwhzsj.企业专利 += info.alienPatent;
-        qyfwhzsj.企业专利 += info.classIPatent;
-        qyfwhzsj.企业专利 += info.secondClassPatent;
-        qyfwhzsj.企业专利 += info.thirdPentent;
+        qyfwhzsj.企业专利 += parseFloat(info.alienPatent);
+        qyfwhzsj.企业专利 += parseFloat(info.classIPatent);
+        qyfwhzsj.企业专利 += parseFloat(info.secondClassPatent);
+        qyfwhzsj.企业专利 += parseFloat(info.thirdPentent);
     })
 
     return qyfwhzsj;
@@ -375,7 +379,7 @@ async function getByrzqy(企业融资dbList){
             let parsedTime = moment(info.investmentDate).format("YYYY-MM"); //获取融资时间
             if (parsedTime === month[i]) {
                 企业count += 1;
-                金额count += info.financingAmount;
+                金额count += parseFloat(info.financingAmount);
             }
         })
         byrzqy.融资企业.push({key:month[i], value:企业count});
@@ -474,16 +478,44 @@ function getZscqxq(data) {
 /**
  * 企业资质分类
  */
-function getQyzzfl() {
+function getQyzzfl(data) {
     let qyzzfl = {
         小巨人:0,
         高新企业:0,
-        专精特精:0,
-        高企培育:0,
+        专精特新:0,
+        小巨人培育:0,
     }
     
+    let qyzzflTable = {
+        小巨人:[],
+        高新企业:[],
+        专精特新:[],
+        小巨人培育:[],
+    };
 
+    data.forEach( info => {
+        let {enterprise_qualifications} = info;
+        enterprise_qualifications.forEach( item => {
+            if (item.xjrTime) {
+                qyzzfl.小巨人 += 1;
+                qyzzflTable.小巨人.push([info.enterpriseName, "小巨人"]);
+            }
+            else if (item.gaoXinJiShuTime) {
+                qyzzfl.高新企业 += 1;
+                qyzzflTable.高新企业.push([info.enterpriseName, "高新企业"]);
+            }
+            else if (item.zjtxTime) {
+                qyzzfl.专精特新 += 1;
+                qyzzflTable.专精特新.push([info.enterpriseName, "专精特新"]);
+            }
+            else if (item.xjrPyTime) {
+                qyzzfl.小巨人培育 += 1;
+                qyzzflTable.小巨人培育.push([info.enterpriseName, "小巨人培育"]);
+            }
+        })
+    })
 
+    return {qyzzfl, qyzzflTable}
 }
 
 

src/data/table/qyfwData.ts

@@ -28,7 +28,7 @@ export function qyfwTableData() {
     let keyValueOrTitleList = ["企业基本情况","入孵时长分布","孵化企业行业领域占比","企业服务汇总数据","企业需求动态","企业变化情况","金融服务","在孵企业总营收","知识产权","知识产权饼图","企业资质分类"];//适配 饼图 键值以及需要多个key的
     let barChartList = ["变化趋势分析","企业人才","变化趋势","本月融资企业","本月融资金额"]; //适配 柱状图 折线图 
     let stringList = [];
-    let decollatePlanarList =["企业需求动态详细","地图","金融服务企业","知识产权详情","企业资质分类_小巨人","企业资质分类_高新企业","企业资质分类_专精特新","企业资质分类_高企培育"];//适配 表格
+    let decollatePlanarList =["企业需求动态详细","地图","金融服务企业","知识产权详情","企业资质分类_小巨人","企业资质分类_高新企业","企业资质分类_专精特新","企业资质分类_小巨人培育"];//适配 表格
     let titltListConfig = {};
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);