Merge remote-tracking branch 'origin/master'

nngkxxdp/src/main/java/com/example/nngkxxdp/util/WzkpRecordUtil.java

@@ -38,21 +38,31 @@ public class WzkpRecordUtil {
 
         List<Map<String, Object>> record = new ArrayList<>();
 
+        // 根据部门循环
         for (int i = 0; i < deptList.size(); i++) {
+            // 获取部门项
             Map<String, Object> deptItem = deptList.get(i);
+            // 获取部门名字
             String deptName = deptItem.get("deptname").toString();
             Double baseScore = Convert.toDouble(deptItem.get("baseScore"));
+            // 获取部门下的栏目
             String[] chnlids = Convert.toStr(deptItem.get("haveChnlid"), "").split(",");
 
 
+            // 遍历各个栏目
             for (int j = 0; j < chnlids.length; j++) {
                 String chnlid = chnlids[j];
                 if (Blank.isEmpty(columnInfo.get(deptName + "-" + chnlid))) {
                     System.out.println(deptName + "-" + chnlid);
                     continue;
                 }
+                // 获取超期标识
                 String isExceed = columnInfo.get(deptName + "-" + chnlid).toString();
+                // todo 两周内发文间隔大于14扣分，小于不扣分，拿需要2周内更新的规则专门匹配
+                // 超过更新时间
                 if ("1".equals(isExceed)) {
+                    // todo 区分基础栏目和其他栏目，其他栏目单独处理
+                    // 循环加扣分规则
                     for (int k = 0; k < eventList.size(); k++) {
                         Map<String, Object> eventItem = eventList.get(k);
                         if (!Convert.toBool(eventItem.get("type"))) {
@@ -89,6 +99,7 @@ public class WzkpRecordUtil {
                             Double score = Convert.toDouble(eventItem.get("score"));
                             Double maxScore = Convert.toDouble(eventItem.get("targetScore"));
                             String pId = Convert.toStr(eventItem.get("pId"));
+                            // 动态要闻
                             if ("26".equals(pId)) {
                                 if (addCount > 2) {
                                     double scoreS = (addCount - 2) * score;
@@ -101,6 +112,7 @@ public class WzkpRecordUtil {
                                     }
                                 }
                             } else {
+                                // 区分加分和减分时间（政策文件加分3个月，减分6个月）
                                 if (addCount > 1) {
                                     double scoreS = (addCount - 1) * score;
                                     if (scoreS > 0) {
@@ -131,6 +143,7 @@ public class WzkpRecordUtil {
             if (Blank.isEmpty(deptOtherColumn.get(deptName))) {
                 continue;
             }
+            // 获取部门下的其他栏目
             String[] otherChnlids = deptOtherColumn.get(deptName).split(",");
             for (int j = 0; j < otherChnlids.length; j++) {
                 String chnlid = otherChnlids[j];
@@ -143,6 +156,7 @@ public class WzkpRecordUtil {
                     for (int k = 0; k < eventList.size(); k++) {
                         Map<String, Object> eventItem = eventList.get(k);
                         String pId = eventItem.get("pId").toString();
+                        // todo t_partition、t_dept加上其他栏目chnlid
                         if ("9".equals(pId)) {
                             Map<String, Object> param = new HashMap<>();
 
@@ -156,6 +170,8 @@ public class WzkpRecordUtil {
                         }
                     }
                 } else {
+                    // todo 其他栏目不加分，删除这部分内容
+                    // 在规定时间内发文
                     double scoreS = 0;
                     for (int k = 0; k < eventList.size(); k++) {
                         Map<String, Object> eventItem = eventList.get(k);

nngkxxdp/src/main/resources/static/natj/js/enterStatisMain.js

@@ -511,7 +511,6 @@ function getAllFinan(data1, myChart) {
                 let a = NoToChinese(Number(k) + 1)
                 str += '<th>' + data.finance[j].date + '第一至' + a + '季度</th>'
             }
-
         }
         $('.tableTit').append(str);
         $('.tableMain').append(listdataa);
@@ -542,7 +541,7 @@ function getinlandTrade(obj, myChart) {
                     var ndata = subData[j].data;
                     array.push(ndata.firstQuarter.totalQuarter ?
                         ndata.firstQuarter.totalQuarter : 0);
-					if (ndata.firstThridQuarter) {
+					if (ndata.firstSecondQuarter) {
 						array.push(ndata.firstSecondQuarter.totalQuarter ?
 							ndata.firstSecondQuarter.totalQuarter : 0);
 					}
@@ -616,8 +615,10 @@ function getFinancial(obj, myChart) {
                     var ndata = subData[j].data;
                     array.push(ndata.firstQuarter.totalQuarter ?
                         ndata.firstQuarter.totalQuarter : 0);
-                    array.push(ndata.firstSecondQuarter.totalQuarter ?
-                        ndata.firstSecondQuarter.totalQuarter : 0);
+					if (ndata.firstSecondQuarter) {
+						array.push(ndata.firstSecondQuarter.totalQuarter ?
+							ndata.firstSecondQuarter.totalQuarter : 0);
+					}
                     if (ndata.firstThridQuarter) {
                         array.push(ndata.firstThridQuarter.totalQuarter ?
                             ndata.firstThridQuarter.totalQuarter : 0);
@@ -688,8 +689,10 @@ function getBank(obj, myChart) {
                     var ndata = subData[j].data;
                     array.push(ndata.firstQuarter.totalQuarter ?
                         ndata.firstQuarter.totalQuarter : 0);
-                    array.push(ndata.firstSecondQuarter.totalQuarter ?
-                        ndata.firstSecondQuarter.totalQuarter : 0);
+					if (ndata.firstSecondQuarter) {
+						array.push(ndata.firstSecondQuarter.totalQuarter ?
+							ndata.firstSecondQuarter.totalQuarter : 0);
+					}
                     if (ndata.firstThridQuarter) {
                         array.push(ndata.firstThridQuarter.totalQuarter ?
                             ndata.firstThridQuarter.totalQuarter : 0);
@@ -820,8 +823,10 @@ function getIndustryByTypeAll(list, obj) {
                 var ndata = subData[j].data;
                 array.push(ndata.firstQuarter.totalQuarter ?
                     ndata.firstQuarter.totalQuarter : 0);
-                array.push(ndata.firstSecondQuarter.totalQuarter ?
-                    ndata.firstSecondQuarter.totalQuarter : 0);
+				if (ndata.firstSecondQuarter) {
+					array.push(ndata.firstSecondQuarter.totalQuarter ?
+						ndata.firstSecondQuarter.totalQuarter : 0);
+				}
                 if (ndata.firstThridQuarter) {
                     array.push(ndata.firstThridQuarter.totalQuarter ?
                         ndata.firstThridQuarter.totalQuarter : 0);
@@ -862,8 +867,10 @@ function getScaleByTypeAll(list, obj) {
                 var ndata = subData[j].data;
                 array.push(ndata.firstQuarter.totalQuarter ?
                     ndata.firstQuarter.totalQuarter : 0);
-                array.push(ndata.firstSecondQuarter.totalQuarter ?
-                    ndata.firstSecondQuarter.totalQuarter : 0);
+				if (ndata.firstSecondQuarter) {
+					array.push(ndata.firstSecondQuarter.totalQuarter ?
+						ndata.firstSecondQuarter.totalQuarter : 0);
+				}
                 if (ndata.firstThridQuarter) {
                     array.push(ndata.firstThridQuarter.totalQuarter ?
                         ndata.firstThridQuarter.totalQuarter : 0);
@@ -1169,8 +1176,10 @@ function getOtherBar(list, unit) {
             const current = list[i].subData.find(item => item.subName === name).data;
             quarter.push(current.firstQuarter.totalQuarter);
             alloneBasis.push(current.firstQuarter.oneBasis);
-            quarter.push(current.firstSecondQuarter.totalQuarter);
-            alloneBasis.push(current.firstSecondQuarter.oneBasis);
+			if (current.firstSecondQuarter) {
+				quarter.push(current.firstSecondQuarter.totalQuarter);
+				alloneBasis.push(current.firstSecondQuarter.oneBasis);
+			}
             if (current.firstThridQuarter) {
                 quarter.push(current.firstThridQuarter.totalQuarter);
                 alloneBasis.push(current.firstThridQuarter.oneBasis);
@@ -1194,8 +1203,10 @@ function getOtherBar(list, unit) {
                 const currentList = list[i].subData.find(item => item.subName === k).data;
                 quarter3.push(currentList.firstQuarter.totalQuarter);
                 alloneBasis.push(currentList.firstQuarter.oneBasis);
-                quarter3.push(currentList.firstSecondQuarter.totalQuarter);
-                alloneBasis.push(currentList.firstSecondQuarter.oneBasis);
+				if (currentList.firstSecondQuarter) {
+					quarter3.push(currentList.firstSecondQuarter.totalQuarter);
+					alloneBasis.push(currentList.firstSecondQuarter.oneBasis);
+				}
                 if (currentList.firstThridQuarter) {
                     quarter3.push(currentList.firstThridQuarter.totalQuarter);
                     alloneBasis.push(currentList.firstThridQuarter.oneBasis);

nngkxxdp/src/main/resources/static/natj/json/bank.json

@@ -199,6 +199,32 @@
           }
         }
       ]
-    }
+    },
+	{
+	  "date": "2022",
+	  "name": "金融机构贷款",
+	  "subData": [
+	    {
+	      "type": 401,
+	      "subName": "金融机构人民币存款余额",
+	      "data": {
+	        "firstQuarter": {
+	          "totalQuarter": 1977,
+	          "oneBasis": 7.8
+	        }
+	      }
+	    },
+	    {
+	      "type": 402,
+	      "subName": "金融机构人民币贷款余额",
+	      "data": {
+	        "firstQuarter": {
+	          "totalQuarter": 2203,
+	          "oneBasis": 18.1
+	        }
+	      }
+	    }
+	  ]
+	}
   ]
 }

nngkxxdp/src/main/resources/static/natj/json/construction.json

@@ -63,6 +63,16 @@
         22,
         21.0
       ]
-    }
+    },
+	{
+	  "date": "2022",
+	  "name": "建筑业",
+	  "totalNum": [
+	    "684546.4"
+	  ],
+	  "alloneBasis": [
+	    11.2
+	  ]
+	}
   ]
 }

nngkxxdp/src/main/resources/static/natj/json/financial.json

@@ -287,6 +287,42 @@
           }
         }
       ]
-    }
+    },
+	{
+	  "date": "2022",
+	  "name": "地方财政收支",
+	  "subData": [
+	    {
+	      "type": 301,
+	      "subName": "＃公共财政收入",
+	      "data": {
+	        "firstQuarter": {
+	          "totalQuarter": 144768,
+	          "oneBasis": 0.4
+	        }
+	      }
+	    },
+	    {
+	      "type": 302,
+	      "subName": "税收收入",
+	      "data": {
+	        "firstQuarter": {
+	          "totalQuarter": 115456,
+	          "oneBasis": 3.5
+	        }
+	      }
+	    },
+	    {
+	      "type": 303,
+	      "subName": "＃公共财政支出",
+	      "data": {
+	        "firstQuarter": {
+	          "totalQuarter": 196619,
+	          "oneBasis": -9.8
+	        }
+	      }
+	    }
+	  ]
+	}
   ]
 }

nngkxxdp/src/main/resources/static/natj/json/realtyMarket.json

@@ -63,6 +63,16 @@
         -9.4,
         -11.3
       ]
-    }
+    },
+	{
+	  "date": "2022",
+	  "name": "商品房建设与销售",
+	  "totalNum": [
+	    "37.792"
+	  ],
+	  "alloneBasis": [
+	    -4.5
+	  ]
+	}
   ]
 }