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

修改设计出图bug

Browse Source
This commit is contained in:
dfdg
2025-09-02 09:54:26 +08:00
parent 659e4e3d5f
commit a3ef525ab6
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<ExcelData> dataList = readExcel(file);
List<DesVolumeCatalogCreateReq> 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);

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/dto/ExcelData.java
View File

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

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

@ -277,6 +277,7 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl<DesVolumeCatalogMap
String documentName = req.getDocumentName();
String auditStatus = req.getAuditStatus();
lqw.orderByDesc(DesVolumeCatalog::getCreateTime);
lqw.orderByAsc(DesVolumeCatalog::getVolumeNumber);
lqw.like(StringUtils.isNotBlank(documentName), DesVolumeCatalog::getDocumentName, documentName);
lqw.eq(StringUtils.isNotBlank(volumeNumber), DesVolumeCatalog::getVolumeNumber, volumeNumber);
lqw.eq(ObjectUtils.isNotEmpty(projectId), DesVolumeCatalog::getProjectId, projectId);

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

@ -341,7 +341,9 @@ public class DesVolumeFileServiceImpl extends ServiceImpl<DesVolumeFileMapper, D
// 关联文件信息
Long fileId = volumeFile.getFileId();
SysOssVo ossVo = ossService.getById(fileId);
vo.setFileUrl(ossVo.getUrl());
if (ossVo != null){
vo.setFileUrl(ossVo.getUrl());
}
return vo;
}