lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2025-12-19bug修改

Browse Source
This commit is contained in:
dfdg
2025-12-19 20:03:05 +08:00
parent 13a121b9ac
commit 914a474c43
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesVolumeCatalogController.java
View File

@ -261,13 +261,37 @@ public class DesVolumeCatalogController extends BaseController {
Row row = sheet.getRow(rowIndex);
if (hasValidData(row)) {
String designSubitem = getCellValue(row.getCell(0));
if (designSubitem == null || designSubitem.isEmpty()){
throw new RuntimeException("第"+(rowIndex+1)+"行：子项名称不能为空");
}
String specialty = getCellValue(row.getCell(1));
if (specialty == null || specialty.isEmpty()){
throw new RuntimeException("第"+(rowIndex+1)+"行：专业不能为空");
}
String specialtyId = getCellValue(row.getCell(2));
if (specialtyId == null || specialtyId.isEmpty()){
throw new RuntimeException("第"+(rowIndex+1)+"行：专业"+specialty+"不存在，推荐使用系统下载模板进行数据填充");
}
String principal = getCellValue(row.getCell(3));
if (principal == null || principal.isEmpty()){
throw new RuntimeException("第"+(rowIndex+1)+"行：人员不能为空");
}
String principalId = getCellValue(row.getCell(4));
if (principalId == null || principalId.isEmpty()){
throw new RuntimeException("第"+(rowIndex+1)+"行：人员"+principal+"不存在，推荐使用系统下载模板进行数据填充");
}
String volumeNumber = getCellValue(row.getCell(5));
if (volumeNumber == null || volumeNumber.isEmpty()){
throw new RuntimeException("第"+(rowIndex+1)+"行：卷册编号不能为空");
}
String documentName = getCellValue(row.getCell(6));
if (documentName == null || documentName.isEmpty()){
throw new RuntimeException("第"+(rowIndex+1)+"行：资料名称不能为空");
}
LocalDate plannedCompletion = getLocalDateValue(row.getCell(7));
if (plannedCompletion == null){
throw new RuntimeException("第"+(rowIndex+1)+"行：计划出图时间不能为空");
}
ExcelData excelData = new ExcelData(
designSubitem, specialtyId, principalId, volumeNumber, documentName,

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/BusBillofquantitiesBo.java
View File

@ -37,7 +37,7 @@ public class BusBillofquantitiesBo extends BaseEntity {
/**
* 表名
*/
@NotBlank(message = "表名不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotBlank(message = "表名不能为空", groups = { AddGroup.class, EditGroup.class })
private String sheet;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java
View File

@ -529,8 +529,8 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl<DesVolumeCatalogMap
// 主 Sheet 设置表头
Row sheetRow = mainSheet.createRow(0);
String[] headers = {"子项名称", "专业", "专业编码",
"人员", "人员编码", "卷册号", "资料名称", "计划出图时间"};
String[] headers = {"*子项名称", "*专业", "*专业编码",
"*人员", "*人员编码", "*卷册号", "*资料名称", "*计划出图时间"};
for (int i = 0; i < headers.length; i++) {
Cell cell = sheetRow.createCell(i);
cell.setCellValue(headers[i]);