From b3b505d3a9d99472e0777d32bb7769f946d02328 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 6 Jul 2021 10:37:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E5=91=98=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E4=B8=BA=E6=9C=88=E4=BB=BD=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E4=B8=8D=E4=BC=A0=EF=BC=8C=E4=B8=8D=E4=BC=A0=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E6=9C=88=E4=BB=BDsum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/GridMemberDataAnalysisFromDTO.java   |  1 -
 .../controller/GovOrgController.java          | 10 ++++---
 .../FactGridMemberStatisticsDailyDao.xml      | 26 ++++++++++++++-----
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridMemberDataAnalysisFromDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridMemberDataAnalysisFromDTO.java
index 3b8c7425e7..1803db4c96 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridMemberDataAnalysisFromDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridMemberDataAnalysisFromDTO.java
@@ -14,7 +14,6 @@ public class GridMemberDataAnalysisFromDTO {
 
     // 搜索的人员姓名
     private String searchedStaffName;
-    @NotBlank(message = "月份不能为空", groups = { listGridMemberDatas.class })
     private String month;
     @NotBlank(message = "排序规则不能为空", groups = { listGridMemberDatas.class })
     private String sort;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
index f78bb69f30..0a201b17f0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
@@ -104,15 +104,19 @@ public class GovOrgController {
         }
 
         // 月份格式判断
-        if (!month.matches("\\d{4}/\\d{2}")) {
-            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), "月份格式错误:" + month);
+        if (month != null) {
+            if (!month.matches("\\d{4}/\\d{2}")) {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), "月份格式错误:" + month);
+            } else {
+                month = month.replace("/", "");
+            }
         }
 
         // 网格id为空处理
         if (CollectionUtils.isEmpty(gridIds)) {
             gridIds = new ArrayList<>();
         }
-        List<GridMemberDataAnalysisResultDTO> resultList = aggreGridService.getGridMemberDataAnalysis(gridIds, searchedStaffName, loginUserId, month.replace("/", ""), sortType.getValue(), pageNo, pageSize);
+        List<GridMemberDataAnalysisResultDTO> resultList = aggreGridService.getGridMemberDataAnalysis(gridIds, searchedStaffName, loginUserId, month, sortType.getValue(), pageNo, pageSize);
         return new Result().ok(resultList);
     }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
index 47de1c36ac..f43b3e99a1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
@@ -74,12 +74,23 @@
                member.pids,
                member.staff_id,
                member.staff_name,
-               member.project_count,
-               member.issue_to_project_count,
-               member.closed_issue_count,
-               member.project_response_count,
-               member.project_transfer_count,
-               member.project_closed_count
+                <if test="month != null">
+                    member.project_count,
+                    member.issue_to_project_count,
+                    member.closed_issue_count,
+                    member.project_response_count,
+                    member.project_transfer_count,
+                    member.project_closed_count
+                </if>
+                <if test="month == null">
+                    sum(member.project_count) project_count,
+                    sum(member.issue_to_project_count) issue_to_project_count,
+                    sum(member.closed_issue_count) closed_issue_count,
+                    sum(member.project_response_count) project_response_count,
+                    sum(member.project_transfer_count) project_transfer_count,
+                    sum(member.project_closed_count) project_closed_count
+                </if>
+
         from fact_grid_member_statistics_daily member
         <where>
             <if test="gridIds != null and gridIds.size() > 0">
@@ -95,6 +106,9 @@
             </if>
             and del_flag = 0
         </where>
+        <if test="month == null">
+            group by member.staff_id
+        </if>
         order by ${sort} desc
     </select>