From 2cf47388b765be947805a51ece7608b27e47650b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 22 十二月 2023 17:02:21 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
index 1e31c4f..25e9976 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
@@ -6,6 +6,7 @@
import com.zt.core.sys.dto.DictLeafDto;
import com.zt.life.export.dto.WordFile;
import com.zt.life.export.service.WordFileService;
+import com.zt.life.modules.contractReview.model.ContractReview;
import com.zt.life.modules.mainPart.utils.GetFilesPath;
import com.zt.life.modules.mainPart.utils.GetShowDictList;
import com.zt.life.modules.project.dao.EnvironDao;
@@ -109,9 +110,13 @@
if (data.getTestAgencyInfo() == null)
data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
if (environId != null) {
- OssDto ossDto = sysOssConfigService.getOssByBusiType(environId, "test_environt_diagram");
- if (ossDto != null) {
- data.setFiles(ossDto);
+ OssDto ossDto1 = sysOssConfigService.getOssByBusiType(environId, "test_environ_diagram");
+ OssDto ossDto2 = sysOssConfigService.getOssByBusiType(environId, "test_environ");
+ if (ossDto1 != null ) {
+ data.setFiles(ossDto1);
+ }
+ if (ossDto2 != null){
+ data.setFiles2(ossDto2);
}
}
@@ -125,7 +130,11 @@
* @return
*/
public List<Environ> page(QueryFilter queryFilter) {
- return baseDao.getList(queryFilter.getQueryParams());
+ List<Environ> list = baseDao.getList(queryFilter.getQueryParams());
+ if (list.size() > 0) {
+ sysOssService.setListOsses(list, "test_environ");
+ }
+ return list;
}
/**
@@ -198,6 +207,7 @@
testAgencyInfoService.update(environDto.getTestAgencyInfo());
}
sysOssConfigService.updateOss(environDto.getEnviron().getId(), environDto.getFiles());// 淇濆瓨闄勪欢
+ sysOssConfigService.updateOss(environDto.getEnviron().getId(), environDto.getFiles2());// 淇濆瓨闄勪欢
return true;
}
--
Gitblit v1.9.1