no message

src/data/db/zhyy.ts

@@ -3,6 +3,7 @@ import { AWARDLEVEL, FOLLOWUPSTATUS, FUHUASTATE, INDUSTRY, MOVEOUTTYPE, NEEDCATE
 import { selectData, selectManyTableData } from "./operationalData";
 import { changeEnumValue } from "../../tools/eccEnum";
 import { getChart, getYearList } from "./out";
+import { getMySqlMs } from "../../tools/systemTools";
 
 
 function getStartAndEndTimeYearList(startTime, endTime) {
@@ -261,11 +262,11 @@ export async function getZhyy() {
         let {eId, annual} = info;
         let itemCount = 0;
         let itemYear = new Date(annual).getFullYear();
-        if (info.zhuanKe) itemCount += info.zhuanKe;
-        if (info.benKe) itemCount += info.benKe;
-        if (info.shuoshi) itemCount += info.shuoshi;
-        if (info.boShi) itemCount += info.boShi;
-        if (info.boshiyishang) itemCount += info.boshiyishang;
+        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;
@@ -273,12 +274,13 @@ export async function getZhyy() {
     let 年度就业人数趋势分析 = Object.values(年度就业人数趋势分析Map);
 
     //产业规模分析
-    let jingYingList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业经营信息, { annual:new Date().getFullYear() }, null);
+    let jingYingThisYear = moment().startOf("year").format("YYYY-MM-DD HH:mm:ss");
+    let jingYingList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业经营信息, { annual:jingYingThisYear }, null);
     let 产业规模企业Map = {};
     jingYingList.forEach(info => {
         let {BI, eId} = info;
         if (!产业规模企业Map[eId]) 产业规模企业Map[eId] = 0;
-        产业规模企业Map[eId] += BI;
+        产业规模企业Map[eId] += parseFloat(BI);
     });
     let 产业规模分析List = [
         {num:400, key:"超400万", value:0},
@@ -292,7 +294,7 @@ export async function getZhyy() {
         for (let i = 0; i < 产业规模分析List.length; i++) {
             let {num} = 产业规模分析List[i];
             if (itemCount > num) {
-                产业规模分析List[i] += itemCount;
+                产业规模分析List[i].value += itemCount;
                 break;
             }
         }