修改：网格员统计数据列表，修为月份可以不传，不传返回所有月份sum

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;

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}")) {
+        if (month != null) {
-            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), "月份格式错误:" + month);
+            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);
     }
 }

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,
+                <if test="month != null">
-               member.issue_to_project_count,
+                    member.project_count,
-               member.closed_issue_count,
+                    member.issue_to_project_count,
-               member.project_response_count,
+                    member.closed_issue_count,
-               member.project_transfer_count,
+                    member.project_response_count,
-               member.project_closed_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>