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

src/data/db/zhyy.ts

@@ -45,6 +45,7 @@ export async function getZhyy() {
     let areaCount = 0;
     let enterpriseCount = 0;
     let 面积变化Map = {};
+    let thisYear = new Date().getFullYear();
 
     let firstDayMsOfMonth = moment().startOf('month').valueOf();
     let checlTimeMs = moment(firstDayMsOfMonth).subtract(8, 'months').valueOf();
@@ -75,6 +76,7 @@ export async function getZhyy() {
             if (enterprise_leases[0].startTime && enterprise_leases[0].endTime ) {
                 let leasesYearList = getStartAndEndTimeYearList(enterprise_leases[0].startTime , enterprise_leases[0].endTime);
                 leasesYearList.forEach(itemYear => {
+                    if (itemYear > thisYear) return;
                     if (!面积变化Map[itemYear] ) 面积变化Map[itemYear] = {key:itemYear, value:0};
                     面积变化Map[itemYear].value += parseFloat(area);
                 });
@@ -258,14 +260,15 @@ export async function getZhyy() {
     jiuYeList.forEach(info => {
         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 (!年度就业人数趋势分析Map[annual]) 年度就业人数趋势分析Map[annual] = {key:annual, value:0};
-        年度就业人数趋势分析Map[annual].value += itemCount;
+        if (!年度就业人数趋势分析Map[itemYear]) 年度就业人数趋势分析Map[itemYear] = {key:itemYear, value:0};
+        年度就业人数趋势分析Map[itemYear].value += itemCount;
     });
     let 年度就业人数趋势分析 = Object.values(年度就业人数趋势分析Map);