Merge branch 'master' of http://123.207.147.179:8888/node_server/yuyiViewServer

src/biz/qyfw.ts

@@ -25,7 +25,7 @@ export async function getData(req, res) {
     let fhqyhylyzbPackageData = keyValuePackage(dbData['孵化企业行业领域占比'].dataList);
     ret['fhqyhylyzb'] = getKeyValueOut('孵化企业行业领域占比', fhqyhylyzbPackageData);
                     
-    let qyrcPackageData = onceYBarChartPackage( excelData['企业人才'], '','');
+    let qyrcPackageData = onceYBarChartPackage( dbData['企业人才'], '','');
     ret['qyrc'] = getOnceYBarChartOut('企业人才', qyrcPackageData);
                     
     let qyfwhzsjPackageData = keyValuePackage(dbData['企业服务汇总数据'].dataList);

src/data/db/jxgljsc.ts

@@ -212,6 +212,10 @@ async function zysje(data) {
 
 //在孵企业总营收
 async function zfqyzys(data) {
+    let distinctMap = {};
+    data.forEach(info => {
+        distinctMap[info.eId] = {BI:0};
+    });
     let zfqyzys = {
         "500万以下":0,
         "500万-1000万":0,
@@ -219,15 +223,20 @@ async function zfqyzys(data) {
         "2000万以上":0
     }
 
-    for (let i = 0; i < data.length; i++) {
+    let 经营信息dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业经营信息, {}, null);
+
     //获取在孵企业经营数据
-        let 经营信息dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业经营信息, {eId:data[i].eId}, null);
     经营信息dbList.forEach( info => { //BI（单位万元）
+        distinctMap[info.eId].BI += parseFloat(info.BI);
+    });
+
+    for (let key in distinctMap) {
+        if (!distinctMap[key].BI) continue;
+        let info = distinctMap[key];
         if (info.BI < 500) zfqyzys["500万以下"] += 1;
         else if (info.BI >= 500 && info.BI < 1000) zfqyzys["500万-1000万"] += 1;
         else if (info.BI >= 1000 && info.BI < 2000) zfqyzys["1000万-2000万"] += 1;
         else zfqyzys["2000万以上"] += 1;
-        })
     }
 
     return zfqyzys
@@ -297,8 +306,7 @@ async function qyfhs(data) {
     data.forEach( info => {
         let {enterprise_qualifications} = info;
         enterprise_qualifications.forEach( item => {
-            // if (item.xjrTime) qyfhs.小巨人 += 1;
-            if (item.kexiaoTime) qyfhs.科小 += 1;//新增"科小"
+            if (item.kxTime) qyfhs.科小 += 1;//新增"科小"
             else if (item.xjrTime) qyfhs.小巨人 += 1;
             else if (item.gaoXinJiShuTime) qyfhs.高新企业 += 1;
             else if (item.zjtxTime) qyfhs.专精特新 += 1;

src/data/db/qyfw.ts

@@ -15,6 +15,7 @@ export async function getEnterprise() {
         变化趋势分析: [], //变化趋势分析
         入孵时长分布: { dataList: [], titleList: ['key', 'value'] }, //入孵时长分布
         孵化企业行业领域占比: { dataList: [], titleList: ['key', 'value'] }, //孵化企业行业领域占比
+        企业人才:[], //企业人才
         企业服务汇总数据: { dataList: [], titleList: ['key', 'value'] }, //企业服务汇总数据
         企业需求动态: { dataList: [], titleList: ['key', 'value'] }, //企业需求动态
         企业需求动态详细: { bodyList: [], headerList: [['企业名称', '类型', 'eId']] }, //企业需求动态详细
@@ -166,6 +167,9 @@ export async function getEnterprise() {
     qyfw.企业资质分类_专精特新.bodyList = qyzzflTable.专精特新;
     qyfw.企业资质分类_小巨人培育.bodyList = qyzzflTable.小巨人培育;
 
+    let 企业人才就业人数 = await getQyrc();
+    qyfw.企业人才 = getChart(企业人才就业人数);
+
     return qyfw;
 }
 
@@ -665,24 +669,44 @@ function getQyzzfl(data) {
  * 企业人才
  */
 async function getQyrc() {
-    let year = getYearList();
+    // let year = getYearList();
     let qyrc = {
         "就业人数": [],
         "创业团队分布": []
     }
-    for (let i = 0; i < year.length; i++) {
-        let dbData = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.参保记录, { annual: year[i] }, null);
-        let count = 0;
-        dbData.forEach(info => {
-            let { zhuanKe, benKe, yanJiuSheng, boShi, qiTa } = info;
-            count += zhuanKe;
-            count += benKe;
-            count += yanJiuSheng;
-            count += boShi;
-            count += qiTa;
-        })
-        qyrc["就业人数"].push({ key: year[i], value: count })
-    }
+
+    //就业
+    let jiuYeList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.参保记录, {}, null);
+    let 年度就业人数趋势分析Map = {};
+    jiuYeList.forEach(info => {
+        let {eId, annual} = info;
+        let itemCount = 0;
+        let itemYear = new Date(annual).getFullYear();
+        if (info.zhuanKe) itemCount += parseInt(info.zhuanKe);
+        if (info.benKe) itemCount += parseInt(info.benKe);
+        if (info.shuoshi) itemCount += parseInt(info.shuoshi);
+        if (info.boShi) itemCount += parseInt(info.boShi);
+        if (info.boshiyishang) itemCount += parseInt(info.boshiyishang);
+
+        if (!年度就业人数趋势分析Map[itemYear]) 年度就业人数趋势分析Map[itemYear] = {key:itemYear, value:0};
+        年度就业人数趋势分析Map[itemYear].value += itemCount;
+    });
+    let 年度就业人数趋势分析 = Object.values(年度就业人数趋势分析Map);
+    qyrc["就业人数"] = 年度就业人数趋势分析;
+
+    // for (let i = 0; i < year.length; i++) {
+    //     let dbData = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.参保记录, { annual: year[i] }, null);
+    //     let count = 0;
+    //     dbData.forEach(info => {
+    //         let { zhuanKe, benKe, yanJiuSheng, boShi, qiTa } = info;
+    //         count += zhuanKe;
+    //         count += benKe;
+    //         count += yanJiuSheng;
+    //         count += boShi;
+    //         count += qiTa;
+    //     })
+    //     qyrc["就业人数"].push({ key: year[i], value: count })
+    // }
 
     return qyrc;
 }