From 3349d7dc16eee58329b1293c01d6514c866b7627 Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Mon, 1 Jun 2026 17:08:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A5=BC=E5=AE=87=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=B1=82=E7=BA=A7=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/ex/BasicBuildingMapperExt.xml     | 58 ++++++++++++++++---
 .../business/vo/building/BuildingPageVO.java  | 17 ++++++
 2 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/data-center-business-dao/src/main/resources/mappers/ex/BasicBuildingMapperExt.xml b/data-center-business-dao/src/main/resources/mappers/ex/BasicBuildingMapperExt.xml
index 9873258..0eff518 100644
--- a/data-center-business-dao/src/main/resources/mappers/ex/BasicBuildingMapperExt.xml
+++ b/data-center-business-dao/src/main/resources/mappers/ex/BasicBuildingMapperExt.xml
@@ -49,14 +49,57 @@
             bbuilding.site_manager,
             bbuilding.king_contract_no,
         	bsales.salesforce_id,
-            GROUP_CONCAT(pa.id) AS siteIds,
-            GROUP_CONCAT(pa.`name`) AS siteNames
+            GROUP_CONCAT(DISTINCT pa.id ORDER BY pa.id) AS siteIds,
+            GROUP_CONCAT(DISTINCT pa.code ORDER BY pa.id) AS siteCodes,
+            GROUP_CONCAT(DISTINCT pa.name ORDER BY pa.id) AS siteNames,
+
+            GROUP_CONCAT(DISTINCT area.id ORDER BY area.id) AS areaIds,
+            GROUP_CONCAT(DISTINCT area.code ORDER BY area.id) AS areaCodes,
+            GROUP_CONCAT(DISTINCT area.name ORDER BY area.id) AS areaName,
+
+            GROUP_CONCAT(DISTINCT store.id ORDER BY store.id) AS storeIds,
+            GROUP_CONCAT(DISTINCT store.code ORDER BY store.id) AS storeCodes,
+            GROUP_CONCAT(DISTINCT store.name ORDER BY store.id) AS storeNames,
+
+            GROUP_CONCAT(DISTINCT branch.id ORDER BY branch.id) AS branchIds,
+            GROUP_CONCAT(DISTINCT branch.code ORDER BY branch.id) AS branchCodes,
+            GROUP_CONCAT(DISTINCT branch.name ORDER BY branch.id) AS branchNames
         FROM
         	basic_building bbuilding
-        INNER JOIN data_center_aeon_admin.basic_company bcomp ON bcomp.id = bbuilding.company_id
-        LEFT JOIN dashboard_level_relation_site_building rela ON bbuilding.`building_id` = rela.building_id
-        LEFT JOIN dashboard_level_site pa ON rela.site_id = pa.`id`
-        LEFT JOIN basic_salesforce bsales ON bsales.id = bbuilding.salesforce_primary_id
+        INNER JOIN data_center_aeon_admin.basic_company bcomp
+        ON bcomp.id = bbuilding.company_id
+
+        LEFT JOIN dashboard_level_relation_site_building rela
+        ON bbuilding.building_id = rela.building_id
+
+        LEFT JOIN dashboard_level_site pa
+        ON rela.site_id = pa.id
+        AND pa.flag = 0
+
+        LEFT JOIN dashboard_level_relation_area_site ras
+        ON pa.id = ras.site_id
+
+        LEFT JOIN dashboard_level_area area
+        ON ras.area_id = area.id
+        AND area.flag = 0
+
+        LEFT JOIN dashboard_level_relation_store_area rsa
+        ON area.id = rsa.area_id
+
+        LEFT JOIN dashboard_level_store store
+        ON rsa.store_id = store.id
+        AND store.flag = 0
+
+        LEFT JOIN dashboard_level_relation_branch_store rbs
+        ON store.id = rbs.store_id
+
+        LEFT JOIN dashboard_level_branch branch
+        ON rbs.branch_id = branch.id
+        AND branch.flag = 0
+
+        LEFT JOIN basic_salesforce bsales
+        ON bsales.id = bbuilding.salesforce_primary_id
+
         WHERE 
         	bbuilding.flag != 1 AND bcomp.flag != 1
         AND bbuilding.company_id IN <foreach collection="companyIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
@@ -66,7 +109,7 @@
         <if test="buildingIdList != null">
            AND bbuilding.building_id IN <foreach collection="buildingIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
         </if>
-        <if test="buildingName != null">
+        <if test="buildingName != null and buildingName != ''">
            AND bbuilding.name LIKE CONCAT('%',#{buildingName},'%')
         </if>
         <if test="platformType != null and platformType == 1">
@@ -76,6 +119,7 @@
             AND pa.`id` = #{siteId}
         </if>
         GROUP BY bbuilding.building_id
+        ORDER BY bbuilding.building_id DESC
     </select>
 
     <select id="getAll" resultType="com.techsor.datacenter.business.vo.building.BuildingPageVO">
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/building/BuildingPageVO.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/building/BuildingPageVO.java
index 716f1d1..607ab9c 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/building/BuildingPageVO.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/building/BuildingPageVO.java
@@ -59,6 +59,8 @@ public class BuildingPageVO{
 	@Schema(description = "site层级ID",example = "2")
 	private String siteIds;
 
+	private String siteCodes;
+
 	@Schema(description = "site层级名称",example = "2")
 	private String siteNames;
 
@@ -77,4 +79,19 @@ public class BuildingPageVO{
 	@Schema(description = "キング契約先番号", example = "25")
 	private String kingContractNo;
 
+	private String branchIds;
+	@Schema(description = "支社名称", example = "user1", required = false)
+	private String branchNames;
+
+	@Schema(description = "支社编码", example = "user1", required = false)
+	private String branchCodes;
+
+	private String areaIds;
+	private String areaCodes;
+	private String areaName;
+
+	private String storeIds;
+	private String storeCodes;
+	private String storeNames;
+
 }

From 7df2d0abb7b60636ced423b954002730306a8c08 Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Tue, 2 Jun 2026 09:23:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?basic=5Fasset=5Fclass=5Fbig=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0type=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/db/migration/V85__asset_class_big_classify.sql     | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 data-center-business-controller/src/main/resources/db/migration/V85__asset_class_big_classify.sql

diff --git a/data-center-business-controller/src/main/resources/db/migration/V85__asset_class_big_classify.sql b/data-center-business-controller/src/main/resources/db/migration/V85__asset_class_big_classify.sql
new file mode 100644
index 0000000..0858bbe
--- /dev/null
+++ b/data-center-business-controller/src/main/resources/db/migration/V85__asset_class_big_classify.sql
@@ -0,0 +1 @@
+ALTER TABLE `basic_asset_class_big` ADD `type` int DEFAULT 0 COMMENT '0-个别，1-全部';
\ No newline at end of file