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

src/biz/qyfw.ts

@@ -16,7 +16,7 @@ export async function getData(req, res) {
     let qyjbqkPackageData = keyValuePackage(dbData['企业基本情况'].dataList);
     ret['qyjbqk'] = getKeyValueOut('企业基本情况', qyjbqkPackageData);
                     
-    let bhqsfxPackageData = onceYBarChartPackage( excelData['变化趋势分析'], '','');
+    let bhqsfxPackageData = onceYBarChartPackage( dbData['变化趋势分析'], '','');
     ret['bhqsfx'] = getOnceYBarChartOut('变化趋势分析', bhqsfxPackageData);
                     
     let rfszfbPackageData = keyValuePackage(dbData['入孵时长分布'].dataList);

src/data/db/qyfw.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { FUHUASTATE, INDUSTRY, MOVEOUTTYPE, OPERATIONALDATATYPE, SELECTPARAM, STATE, TABLENAME, INTELLECTUALPROPERTYRIGHT} from "../../config/enum";
+import { FUHUASTATE, INDUSTRY, MOVEOUTTYPE, OPERATIONALDATATYPE, SELECTPARAM, STATE, TABLENAME, INTELLECTUALPROPERTYRIGHT, IPRTYPECLIENT} from "../../config/enum";
 import { selectData, selectManyTableData } from "./operationalData";
 import { getChart, getKeyValue, getMonthList, getYearList } from "./out";
 import { Console, count, log } from "console";
@@ -72,7 +72,9 @@ export async function getEnterprise() {
     qyfw.企业基本情况.dataList = getKeyValue(qyjbqk);
 
     //变化趋势分析 //todo 需要日志表
-    getBhqsfx(fhdbList);
+    // getBhqsfx(fhdbList);
+    let 在孵企业变化趋势 = getZfqy(在孵dbList);
+    qyfw.变化趋势分析 = getChart(在孵企业变化趋势);
 
     //入孵时长分布
     let rfscfb = getRfscfx(fhdbList);
@@ -84,7 +86,7 @@ export async function getEnterprise() {
         if (isNaN(anyKey)) {
             let keyStr = key;
             let industry = INDUSTRY[key];
-            let count = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业基础信息表, { industry }, null);
+            let count = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业基础信息表, { industry:{"%like%":industry} }, null);
             qyfw.孵化企业行业领域占比.dataList.push({ key: keyStr, value: count })
         }
     }
@@ -270,6 +272,32 @@ function getBhqsfx(data) {
 
 
 /**
+ * 在孵企业——变化趋势
+ */
+ function getZfqy(data) {
+    let year = getYearList();
+    let bhqsfx = {
+        "在孵": [],
+        "毕业": []
+    }
+    for (let i = 0; i < year.length; i++) {
+        let count = 0;
+        data.forEach(info => {
+            let startTimeYear = moment(info.startTime).year(); //获取入孵开始时间
+            let thisYear = parseInt(year[i]);
+            if (startTimeYear === thisYear) count += 1;
+        })
+        bhqsfx.在孵.push({ key: year[i], value: count });
+        bhqsfx.毕业.push({ key: year[i], value: 0 });
+    }
+
+    // let qybhqkbhqs = getChart(bhqsfx.在孵);
+
+    return bhqsfx;
+}
+
+
+/**
  * 入孵时长分布
  * @param data 
  */
@@ -321,17 +349,12 @@ async function getQyfwhzsj() {
 
     let 企业专利dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业专利表, {}, null);
     企业专利dbList.forEach(info => {
-
-        /**
-         * @author: xiaoyouyou
-         */
         qyfwhzsj.企业专利 += parseInt(info.alienPatent || 0);
         qyfwhzsj.企业专利 += parseInt(info.classIPatent || 0);
         qyfwhzsj.企业专利 += parseInt(info.secondClassPatent || 0);
         qyfwhzsj.企业专利 += parseInt(info.thirdPentent || 0);
     })
 
-
     return qyfwhzsj;
 }
 
@@ -424,8 +447,8 @@ async function getJrfw(data, 企业融资dbList) {
 
     let nowTime = moment();
     企业融资dbList.forEach(info => {
-        let parsedTime = moment(info.investmentDate); //获取融资时间
-        if (parsedTime.month() === nowTime.month()) {
+        let parsedTime = moment(info.investmentDate).format("YY/MM"); //获取融资时间
+        if (parsedTime === moment(nowTime).format("YY/MM")) {
             jrfw.本月融资企业 += 1;
             jrfw.本月融资金额 += parseFloat(info.financingAmount);
         }
@@ -527,11 +550,6 @@ function getJrfwqy(data) {
  * 知识产权
  */
 function getZscq(data) {
-    // let zscq = {
-    //     一类专利:0,
-    //     二类专利:0
-    // };
-
     let zscqbt = {
         软件著作: 0,
         发明专利: 0,
@@ -542,20 +560,21 @@ function getZscq(data) {
     }
 
     data.forEach(info => {
-        // zscq.一类专利 += info.classIPatent;
-        // zscq.二类专利 += info.secondClassPatent
-
-        // zscqbt.软件著作 += info.alienPatent;
-        // zscqbt.发明专利 += info.classIPatent;
-        // zscqbt.海外专利 += info.secondClassPatent
-        // zscqbt.植物新品种 += info.thirdPentent;
-        // zscqbt.集成电路布图 += info.thirdPentent;
-        zscqbt.软件著作 += info.iprType == INTELLECTUALPROPERTYRIGHT.软件著作 ? 1 : 0;
-        zscqbt.发明专利 += info.iprType == INTELLECTUALPROPERTYRIGHT.发明专利 ? 1 : 0;
-        zscqbt.海外专利 += info.iprType == INTELLECTUALPROPERTYRIGHT.海外专利 ? 1 : 0;
-        zscqbt.其他 += info.iprType == INTELLECTUALPROPERTYRIGHT.其他 ? 1 : 0;
-        // zscqbt.植物新品种 += info.iprType == INTELLECTUALPROPERTYRIGHT.植物新品种 ? 1 : 0;
-        // zscqbt.集成电路布图 += info.iprType == INTELLECTUALPROPERTYRIGHT.集成电路布图 ? 1 : 0;
+        switch (info.iprType) {
+            case IPRTYPECLIENT.软件著作:
+                zscqbt.软件著作 += info.number;
+            break;
+            case IPRTYPECLIENT.发明专利:
+                zscqbt.发明专利 += info.number;
+            break;
+            case IPRTYPECLIENT.海外专利:
+                zscqbt.海外专利 += info.number;
+            break;
+            case IPRTYPECLIENT.植物新品种:
+            case IPRTYPECLIENT.集成电路布图:
+                zscqbt.其他 += info.number;
+            break;
+        }
     })
 
     return { zscqbt };