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