From a7e0d2e89800080a114ff89def346875e9c3b699 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 18 Apr 2023 16:28:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=99=BB=E5=BD=95=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=EF=BC=8C=E5=B7=A6=E4=B8=8B=E8=A7=92=E4=B8=8B=E7=BA=A7?=
 =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=B4=A6=E5=8F=B7=E7=99=BB=E5=BD=95=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0=E5=B1=95=E7=A4=BA=E5=89=8D10=EF=BC=8C=E4=B8=94?=
 =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=AC=A1=E6=95=B00=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/yt/CommunityLoginFormDTO.java     | 6 ++++++
 .../src/main/java/com/epmet/dao/StaffLoginLogDao.java    | 4 +++-
 .../com/epmet/service/impl/StaffLoginLogServiceImpl.java | 4 ++--
 .../src/main/resources/mapper/StaffLoginLogDao.xml       | 9 ++++++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java
index 5fc00d0691..81b4135d52 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java
@@ -37,5 +37,11 @@ public class CommunityLoginFormDTO extends PageFormDTO {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date endDate;
+
+    /**
+     * exclude_zero:不展示登录次数为0的社区
+     * all：全部展示
+     */
+    private String dataRange;
 }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java
index e3f1252b8f..0bd7263a29 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java
@@ -27,11 +27,13 @@ public interface StaffLoginLogDao extends BaseDao<StaffLoginLogEntity> {
      * @param orgId
      * @param startDate
      * @param endDate
+     * @param  dataRange exclude_zero:不展示登录次数为0的社区  all：全部展示
      * @return
      */
     List<CommunityLoginResultDTO> pageCommunityCount(@Param("orgId") String orgId,
                                                      @Param("startDate") Date startDate,
-                                                     @Param("endDate") Date endDate);
+                                                     @Param("endDate") Date endDate,
+                                                     @Param("dataRange")String dataRange);
 
     List<CommunityLoginResultDTO> selectCommunityCount(@Param("orgId") String orgId,
                                                      @Param("startDate") Date startDate,
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java
index 37e27b83b1..d295661263 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java
@@ -223,12 +223,12 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
         }
         if (formDTO.getIsPage()) {
             PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
-            List<CommunityLoginResultDTO> list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate());
+            List<CommunityLoginResultDTO> list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate(),formDTO.getDataRange());
             PageInfo<CommunityLoginResultDTO> pageInfo = new PageInfo<>(list);
             return new PageData<>(list, pageInfo.getTotal(), formDTO.getPageSize());
         }
         // 不分页
-        List<CommunityLoginResultDTO> list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate());
+        List<CommunityLoginResultDTO> list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate(),formDTO.getDataRange());
         int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size();
         return new PageData<>(list, total, total);
     }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml
index 9eddf595fa..98d0c99cf1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml
@@ -48,7 +48,14 @@
             <if test='null != endDate'>
                 and l.LOGIN_TIME &lt;= #{endDate}
             </if>
-        GROUP BY ca.id
+        <choose>
+            <when test="null !=dataRange and 'exclude_zero' == dataRange">
+                GROUP BY ca.id having count( l.id )>0
+            </when>
+            <otherwise>
+                GROUP BY ca.id
+            </otherwise>
+        </choose>
         order by count(l.id) desc,ca.CREATED_TIME desc
     </select>