diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesVolumeCatalogController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesVolumeCatalogController.java index 4e068dca..cf73211a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesVolumeCatalogController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesVolumeCatalogController.java @@ -28,6 +28,8 @@ import org.dromara.design.domain.vo.volumefile.DesVolumeFileVo; import org.dromara.design.service.IDesUserService; import org.dromara.design.service.IDesVolumeCatalogService; import org.dromara.design.service.IDesVolumeFileService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -39,6 +41,7 @@ import java.io.InputStream; import java.time.LocalDate; import java.time.ZoneId; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -54,6 +57,7 @@ import java.util.stream.Collectors; @RequestMapping("/design/volumeCatalog") public class DesVolumeCatalogController extends BaseController { + private static final Logger log = LoggerFactory.getLogger(DesVolumeCatalogController.class); @Resource private IDesVolumeCatalogService desVolumeCatalogService; @@ -158,6 +162,7 @@ public class DesVolumeCatalogController extends BaseController { } List dataList = readExcel(file); List desVolumeCatalogCreateReqs = BeanUtil.copyToList(dataList, DesVolumeCatalogCreateReq.class); + Collections.reverse(desVolumeCatalogCreateReqs); for (DesVolumeCatalogCreateReq desVolumeCatalogCreateReq : desVolumeCatalogCreateReqs) { desVolumeCatalogCreateReq.setProjectId(projectId); desVolumeCatalogCreateReq.setDesignState("2"); @@ -199,15 +204,15 @@ public class DesVolumeCatalogController extends BaseController { Row row = sheet.getRow(rowIndex); if (row != null) { String designSubitem = getCellValue(row.getCell(0)); - String designState = getCellValue(row.getCell(1)); +// String designState = getCellValue(row.getCell(1)); // String specialty = getCellValue(row.getCell(2)); // String principal = getCellValue(row.getCell(3)); - String volumeNumber = getCellValue(row.getCell(2)); - String documentName = getCellValue(row.getCell(3)); - LocalDate plannedCompletion = getLocalDateValue(row.getCell(4)); + String volumeNumber = getCellValue(row.getCell(1)); + String documentName = getCellValue(row.getCell(2)); + LocalDate plannedCompletion = getLocalDateValue(row.getCell(3)); ExcelData excelData = new ExcelData( - designSubitem, designState, volumeNumber, documentName, + designSubitem, volumeNumber, documentName, plannedCompletion ); dataList.add(excelData); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/dto/ExcelData.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/dto/ExcelData.java index c6fea385..19a88582 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/dto/ExcelData.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/dto/ExcelData.java @@ -9,7 +9,7 @@ import java.time.LocalDate; */ public class ExcelData { private String designSubitem; - private String designState; +// private String designState; // private String specialty; // private String principal; private String volumeNumber; @@ -17,9 +17,9 @@ public class ExcelData { private LocalDate plannedCompletion; // 构造函数 - public ExcelData(String designSubitem, String designState, String volumeNumber, String documentName, LocalDate plannedCompletion) { + public ExcelData(String designSubitem, String volumeNumber, String documentName, LocalDate plannedCompletion) { this.designSubitem = designSubitem; - this.designState = designState; +// this.designState = designState; // this.specialty = specialty; // this.principal = principal; this.volumeNumber = volumeNumber; @@ -36,13 +36,13 @@ public class ExcelData { this.designSubitem = designSubitem; } - public String getDesignState() { - return designState; - } +// public String getDesignState() { +// return designState; +// } - public void setDesignState(String designState) { - this.designState = designState; - } +// public void setDesignState(String designState) { +// this.designState = designState; +// } // public String getSpecialty() { // return specialty; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java index 2df3b5bd..03218957 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java @@ -277,6 +277,7 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl