From ed2e228306c42b1c76613164c5f4d7cec953b9e5 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 14 Mar 2022 10:32:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BD=91=E6=A0=BC=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4=EF=BC=8C=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E7=BD=91=E6=A0=BC=E9=A1=B9=E7=9B=AE=E7=9A=84(?=
 =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=BD=AC=E7=9A=84=E3=80=81=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E7=9A=84=E3=80=81=E7=BD=91=E6=A0=BC=E5=91=98?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E4=BA=8B=E4=BB=B6=E7=9A=84)=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=B8=8D=E5=9C=A8=E5=8F=AA?=
 =?UTF-8?q?=E6=98=AF=E7=BB=9F=E8=AE=A1=E8=AE=AE=E9=A2=98=E8=BD=AC=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/enums/BizTypeEnum.java      |  1 +
 .../controller/ShiBeiICJobController.java     | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java
index 8edc31e7e2..e6318f61b6 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java
@@ -16,6 +16,7 @@ public enum BizTypeEnum {
 	GROUP("group", "小组"),
 	TOPIC("topic", "话题"),
 	ISSUE("issue", "议题"),
+	GRID_PROJECT("grid_project", "网格项目"),
 	PROJECT("project", "项目"),
 	ARTICLE("article", "文章（党建声音）"),
 	;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiICJobController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiICJobController.java
index 0534f38363..c08ef1af1f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiICJobController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiICJobController.java
@@ -73,6 +73,9 @@ public class ShiBeiICJobController {
         if (bizType.equals(BizTypeEnum.PROJECT.getType())) {
             this.agencyProjectStats(customerId, d);
         }
+        if (bizType.equals(BizTypeEnum.GRID_PROJECT.getType())) {
+            this.gridProjectStats(customerId, d);
+        }
     }
 
     /**
@@ -95,6 +98,26 @@ public class ShiBeiICJobController {
         new Result();
     }
 
+    /**
+     * @Author sun
+     * @Description 数据-项目-网格日(月)统计
+     **/
+    private void gridProjectStats(String customerId, String dateId) {
+        try {
+            if (StringUtils.isNotBlank(dateId)) {
+                dateId = DateUtils.format(DateUtils.parseDate(dateId, DateUtils.DATE_PATTERN_YYYYMMDD));
+            }
+            StatsFormDTO formDTO = new StatsFormDTO();
+            formDTO.setCustomerId(customerId);
+            formDTO.setDate(dateId);
+
+            statsProjectService.gridProjectStats(formDTO);
+        } catch (Exception e) {
+            log.error("网格项目日、月统计失败，参数为：{}" + customerId + StrConstant.HYPHEN + dateId, e);
+        }
+        new Result();
+    }
+
     private void extractUserPointData(String customerId, String dateId) {
         try {
             //基层治理 - 热心市民 screen_party_user_rank_data