|
|
@ -391,7 +391,6 @@ public class ExcelService implements IExcelService { |
|
|
|
} |
|
|
|
}else if (StrUtil.isNotEmpty(roleRelevanceProjectId)) { |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
@ -648,12 +647,17 @@ public class ExcelService implements IExcelService { |
|
|
|
String task1 = ExcelUtil.getCellValue(row.getCell(1)); |
|
|
|
//二级任务名称
|
|
|
|
String task2 = ExcelUtil.getCellValue(row.getCell(2)); |
|
|
|
|
|
|
|
//详情
|
|
|
|
String description = ExcelUtil.getCellValue(row.getCell(3)); |
|
|
|
//开始时间
|
|
|
|
String beginTime = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(4))); |
|
|
|
//结束时间
|
|
|
|
String endTime = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(5))); |
|
|
|
//重复
|
|
|
|
String repeat = ExcelUtil.getCellValue(row.getCell(7)); |
|
|
|
//关联子任务表
|
|
|
|
String subTaskCell = ExcelUtil.getCellValue(row.getCell(8)); |
|
|
|
//关联子项目表
|
|
|
|
String subProject = ExcelUtil.getCellValue(row.getCell(9)); |
|
|
|
String deliver = ExcelUtil.getCellValue(row.getCell(10)); |
|
|
|
String executorRole = ExcelUtil.getCellValue(row.getCell(11)); |
|
|
|