Bläddra i källkod

统计去除已删除数据

hym 4 år sedan
förälder
incheckning
ba20b28c6a

+ 1 - 0
src/main/resources/mapper/GridManagementMapper.xml

@@ -96,6 +96,7 @@
             <if test="status != null">
                 and status = #{status}
             </if>
+            order by a.create_time desc
         </where>
     </select>
 

+ 2 - 2
src/main/resources/mapper/SiteMapper.xml

@@ -167,8 +167,8 @@
                ss.*,ifnull(a.buildingCount,0)buildingCount,ifnull(b.deviceCount,0)deviceCount,
                (SELECT GROUP_CONCAT(su.username SEPARATOR '、') FROM sc_site_user ssu LEFT JOIN sc_user su on(su.id = ssu.user_id and su.`status`= 1)  WHERE ssu.site_id = ss.id and ssu.`status` =1 and ssu.is_admin= 1) as username
         from sc_site ss
-            left join (select count(*)buildingCount,site_id from sc_building group by site_id) a on ss.id=a.site_id
-            left join (select count(*)deviceCount,site_id from sc_device group by site_id) b on ss.id=b.site_id
+            left join (select count(*)buildingCount,site_id from sc_building where status=1 group by site_id) a on ss.id=a.site_id
+            left join (select count(*)deviceCount,site_id from sc_device where status=1 group by site_id) b on ss.id=b.site_id
         where ss.status = 1
         <if test="siteIds != null and siteIds.size()>0">
             and ss.id in <foreach collection="siteIds" item="item" open="(" separator="," close=")">#{item}</foreach>