Merge branch 'jwy' of http://47.100.114.196:3001/jwy/aeon_business_back into zhc

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-全部';

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">

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;
+
 }