From da82539385af0c8ea3d53fe9142a612b9e423ee3 Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Thu, 28 May 2026 08:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E5=AE=87=E6=96=B0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=9Asite=5Fmanager=E3=80=81king=5Fcontract=5Fno?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mappers/ex/BasicBuildingMapperExt.xml   | 2 ++
 .../business/dto/building/OptBuildingParams.java           | 7 ++++++-
 .../datacenter/business/vo/building/BuildingPageVO.java    | 6 ++++++
 .../business/service/impl/BuildingServiceImpl.java         | 6 ++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

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 7e2f4e4..9873258 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
@@ -46,6 +46,8 @@
         	bbuilding.latitude,
         	bbuilding.longitude,
         	bbuilding.salesforce_primary_id,
+            bbuilding.site_manager,
+            bbuilding.king_contract_no,
         	bsales.salesforce_id,
             GROUP_CONCAT(pa.id) AS siteIds,
             GROUP_CONCAT(pa.`name`) AS siteNames
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/building/OptBuildingParams.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/building/OptBuildingParams.java
index 058c535..902b2df 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/building/OptBuildingParams.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/building/OptBuildingParams.java
@@ -56,7 +56,12 @@ public class OptBuildingParams{
 
 	@Schema(description = "salesforce primary ID", example = "25")
 	private Long salesforcePrimaryId;
-	
+
+	@Schema(description = "担当サイト", example = "25")
+	private String siteManager;
+
+	@Schema(description = "キング契約先番号", example = "25")
+	private String kingContractNo;
 	
 	@Data
 	public static class CustomFloorInfo {
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 7b4d277..a21f3c1 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
@@ -71,4 +71,10 @@ public class BuildingPageVO{
 	@Schema(description = "Salesforce id", example = "testSalesforce1")
 	private String salesforceId;
 
+	@Schema(description = "担当サイト", example = "25")
+	private Long siteManager;
+
+	@Schema(description = "キング契約先番号", example = "25")
+	private Long kingContractNo;
+
 }
diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/BuildingServiceImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/BuildingServiceImpl.java
index 47eadd2..5a1c66f 100644
--- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/BuildingServiceImpl.java
+++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/BuildingServiceImpl.java
@@ -302,6 +302,12 @@ public class BuildingServiceImpl implements BuildingService {
 			if (null == optBuildingParams.getSalesforcePrimaryId()) {
 				basicBuilding.setSalesforcePrimaryId(-999L);
 			}
+			if (StringUtils.isBlank(optBuildingParams.getSiteManager())) {
+				basicBuilding.setSiteManager("");
+			}
+			if (StringUtils.isBlank(optBuildingParams.getKingContractNo())) {
+				basicBuilding.setKingContractNo("");
+			}
 
 			BasicBuildingExample example = new BasicBuildingExample();
 			BasicBuildingExample.Criteria criteria = example.createCriteria();