DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

施工进度详情

Browse Source
This commit is contained in:
coolleave
2025-05-13 22:27:40 +08:00
parent 85b36f0a76
commit 7394ce01c9
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaReportDetailVo.java
View File

@@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
@@ -66,6 +66,13 @@ public class OaReportDetailVo {
@ExcelDictFormat(readConverterExp = "逗=号分隔")
private String ossIds;
/**
* 关联图像 OSS URL 列表
*/
@ExcelProperty(value = "关联图像 OSS URL 列表", converter = ExcelDictConvert.class)
private String images;
/**
* 备注
*/

40
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaReportDetailServiceImpl.java
View File

@@ -15,6 +15,7 @@ import com.ruoyi.oa.domain.OaReportDetail;
import com.ruoyi.oa.mapper.OaReportDetailMapper;
import com.ruoyi.oa.service.IOaReportDetailService;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Collection;
@@ -36,6 +37,7 @@ public class OaReportDetailServiceImpl implements IOaReportDetailService {
*/
@Override
public OaReportDetailVo queryById(Long id){
return baseMapper.selectVoById(id);
}
@@ -46,6 +48,25 @@ public class OaReportDetailServiceImpl implements IOaReportDetailService {
public TableDataInfo<OaReportDetailVo> queryPageList(OaReportDetailBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaReportDetail> lqw = buildQueryWrapper(bo);
Page<OaReportDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
for(OaReportDetailVo item : result.getRecords()) {
String ossIds = item.getOssIds();
// 分离拿出ossIds
String[] ossIdArray = new String[0];
if (StringUtils.isNotBlank(ossIds)) {
ossIdArray = ossIds.split(",");
}
// 准备images数组
List<String> images = new ArrayList<>();
// 遍历ossIdArray，添加到images中
for (String ossId : ossIdArray) {
// 查出图片地址
String url = baseMapper.selectImageUrlByOssId(ossId);
images.add(url);
}
// 设置images属性,将images打成，分割的字符串
item.setImages(String.join(",", images));
}
return TableDataInfo.build(result);
}
@@ -55,6 +76,25 @@ public class OaReportDetailServiceImpl implements IOaReportDetailService {
@Override
public List<OaReportDetailVo> queryList(OaReportDetailBo bo) {
LambdaQueryWrapper<OaReportDetail> lqw = buildQueryWrapper(bo);
List<OaReportDetailVo> result = baseMapper.selectVoList(lqw);
for(OaReportDetailVo item : result) {
String ossIds = item.getOssIds();
// 分离拿出ossIds
String[] ossIdArray = new String[0];
if (StringUtils.isNotBlank(ossIds)) {
ossIdArray = ossIds.split(",");
}
// 准备images数组
List<String> images = new ArrayList<>();
// 遍历ossIdArray，添加到images中
for (String ossId : ossIdArray) {
// 查出图片地址
String url = baseMapper.selectImageUrlByOssId(ossId);
images.add(url);
}
// 设置images属性,将images打成，分割的字符串
item.setImages(String.join(",", images));
}
return baseMapper.selectVoList(lqw);
}