toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、二维导出优化

Browse Source 
2、项目详情返回项目来源
This commit is contained in:
lidongyang
2025-12-24 16:05:10 +08:00
parent 2ad18d6ba6
commit a50f257d04
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
1-sql/2025-12-24/project/simulation_demand.sql
View File

@@ -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值，同步待办时判断是否需要更新';
ALTER TABLE simulation_demand MODIFY COLUMN demandSource varchar(16) DEFAULT 'DM';

1
1-sql/2025-12-24/project/simulation_node.sql
View File

@@ -1,2 +1,3 @@
ALTER TABLE simulation_node ADD projectId INT NULL COMMENT '利元亨项目id';
ALTER TABLE simulation_node ADD projectSource varchar(16) NULL COMMENT '项目来源：自建、同步';
ALTER TABLE simulation_node MODIFY COLUMN projectSource varchar(16) DEFAULT 'DM';

10
common/src/main/java/com/sdm/common/utils/excel/ExcelUtil.java
View File

@@ -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));
}
}
}

4
project/src/main/java/com/sdm/project/model/vo/SpdmNodeDetailVo.java
View File

@@ -99,4 +99,8 @@ public class SpdmNodeDetailVo extends BaseEntity {
*/
private String currentPhase;
private Integer projectId;
private String projectSource;
}