From 14725b0abbd736aba3ed65e079db6624de34da05 Mon Sep 17 00:00:00 2001
From: duanliangtao <dlt0099>
Date: Mon, 7 Aug 2023 15:00:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B4=BB=E8=B7=83=E7=A4=BE?=
 =?UTF-8?q?=E5=8C=BA=E4=B8=8E=E4=B8=8D=E6=B4=BB=E8=B7=83=E7=A4=BE=E5=8C=BA?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=B8=AD=E5=BF=98=E8=AE=B0=E5=8A=A0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=99=90=E5=88=B6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/StaffLoginLogDao.xml     | 49 ++++++++++++-------
 1 file changed, 30 insertions(+), 19 deletions(-)

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 0a1bb6fdbe..ad15c2a462 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
@@ -202,25 +202,36 @@
     </select>
 
     <select id="selectOneActivityTotal" resultType="com.epmet.dto.result.yt.ActivityTatalInfo">
-          SELECT
-                COUNT(t.activityCount = '0' OR NULL) inactivityCount,
-                COUNT(t.activityCount > '0' OR NULL) activityCount
-            FROM
-                (
-                    SELECT
-                        COUNT(DISTINCT(l.ID)) activityCount
-                    FROM
-                        customer_agency a
-                    LEFT JOIN staff_login_log l ON a.ID = l.AGENCY_ID
-                    WHERE
-                        a.`LEVEL` = 'community'
-                    AND a.DEL_FLAG = '0'
-                    <if test="orgId!= null and orgId.trim() != ''">
-                        AND a.PIDS LIKE CONCAT('%',#{orgId},'%')
-                    </if>
-                    GROUP BY
-                        a.ID
-                ) t;
+        SELECT
+        COUNT(t.activityCount = '0' OR NULL) inactivityCount,
+        COUNT(t.activityCount > '0' OR NULL) activityCount
+        FROM
+        (
+        SELECT
+        COUNT(DISTINCT(l.ID)) activityCount
+        FROM
+        customer_agency a
+        LEFT JOIN staff_login_log l ON a.ID = l.AGENCY_ID
+        WHERE
+        a.`LEVEL` = 'community'
+        AND a.DEL_FLAG = '0'
+        <if test='null != startDate'>
+            and l.LOGIN_TIME &gt;= #{startDate}
+        </if>
+        <if test='null != endDate'>
+            and l.LOGIN_TIME &lt;= #{endDate}
+        </if>
+        <choose >
+            <when test='isActivity!= null and isActivity == "1" and isActivity.trim() != ""'>
+                AND  l.AGENCY_ID is NOT NULL
+            </when>
+            <otherwise>
+                AND  l.AGENCY_ID is  NULL
+            </otherwise>
+        </choose>
+        GROUP BY
+        a.ID
+        ) t;
 
     </select>