From a50f257d041c788d5fa7040c8b5b7825d0896c37 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Wed, 24 Dec 2025 16:05:10 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BA=8C=E7=BB=B4=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96=202=E3=80=81=E9=A1=B9=E7=9B=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=BF=94=E5=9B=9E=E9=A1=B9=E7=9B=AE=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1-sql/2025-12-24/project/simulation_demand.sql | 3 ++- 1-sql/2025-12-24/project/simulation_node.sql | 3 ++- .../java/com/sdm/common/utils/excel/ExcelUtil.java | 10 ++++++++++ .../com/sdm/project/model/vo/SpdmNodeDetailVo.java | 4 ++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/1-sql/2025-12-24/project/simulation_demand.sql b/1-sql/2025-12-24/project/simulation_demand.sql index e36a4d7c..501fafbf 100644 --- a/1-sql/2025-12-24/project/simulation_demand.sql +++ b/1-sql/2025-12-24/project/simulation_demand.sql @@ -1,2 +1,3 @@ ALTER TABLE simulation_demand ADD demandSource varchar(12) NULL COMMENT '需求来源：自建、同步'; -ALTER TABLE simulation_demand ADD contentHash varchar(64) NULL COMMENT 'hash值，同步待办时判断是否需要更新'; \ No newline at end of file +ALTER TABLE simulation_demand ADD contentHash varchar(64) NULL COMMENT 'hash值，同步待办时判断是否需要更新'; +ALTER TABLE simulation_demand MODIFY COLUMN demandSource varchar(16) DEFAULT 'DM'; \ No newline at end of file diff --git a/1-sql/2025-12-24/project/simulation_node.sql b/1-sql/2025-12-24/project/simulation_node.sql index 55d3efaa..6fcc61ce 100644 --- a/1-sql/2025-12-24/project/simulation_node.sql +++ b/1-sql/2025-12-24/project/simulation_node.sql @@ -1,2 +1,3 @@ ALTER TABLE simulation_node ADD projectId INT NULL COMMENT '利元亨项目id'; -ALTER TABLE simulation_node ADD projectSource varchar(16) NULL COMMENT '项目来源：自建、同步'; \ No newline at end of file +ALTER TABLE simulation_node ADD projectSource varchar(16) NULL COMMENT '项目来源：自建、同步'; +ALTER TABLE simulation_node MODIFY COLUMN projectSource varchar(16) DEFAULT 'DM'; \ No newline at end of file diff --git a/common/src/main/java/com/sdm/common/utils/excel/ExcelUtil.java b/common/src/main/java/com/sdm/common/utils/excel/ExcelUtil.java index 525af0cf..f98d7220 100644 --- a/common/src/main/java/com/sdm/common/utils/excel/ExcelUtil.java +++ b/common/src/main/java/com/sdm/common/utils/excel/ExcelUtil.java @@ -687,6 +687,16 @@ public class ExcelUtil { for (int i = 0; i < 8; i++) { sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, i, i)); } + sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 21, 21)); + sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 22, 22)); + sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 23, 23)); + sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 29, 29)); + sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 30, 30)); + sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 31, 31)); + sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 32, 32)); + sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 33, 33)); + sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 34, 34)); + sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 35, 35)); } } } diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmNodeDetailVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmNodeDetailVo.java index 12eb7447..fffe93cd 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmNodeDetailVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmNodeDetailVo.java @@ -99,4 +99,8 @@ public class SpdmNodeDetailVo extends BaseEntity { */ private String currentPhase; + private Integer projectId; + + private String projectSource; + }