WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

虚拟清单修改

Browse Source
This commit is contained in:
zhn
2022-04-22 17:57:49 +08:00
parent 6d646459c5
commit 755719035c
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+28 -7
View File
@@ -153,6 +153,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
BeanUtils.copyProperties(bussDocumentLibraryEO,dummyInventoryInfoEOTemp); BeanUtils.copyProperties(bussDocumentLibraryEO,dummyInventoryInfoEOTemp);
String id = UUID.randomUUID().toString().replace("-", ""); String id = UUID.randomUUID().toString().replace("-", "");
dummyInventoryInfoEOTemp.setId(id); dummyInventoryInfoEOTemp.setId(id);
dummyInventoryInfoEOTemp.setDummyInventoryBaseId(dummyInventoryInfoEO.getDummyInventoryBaseId());
dummyInventoryInfoEOTemp.setCreateTime(new Date()); dummyInventoryInfoEOTemp.setCreateTime(new Date());
dummyInventoryInfoEOTemp.setUpdateTime(new Date()); dummyInventoryInfoEOTemp.setUpdateTime(new Date());
list.add(dummyInventoryInfoEOTemp); list.add(dummyInventoryInfoEOTemp);
@@ -232,7 +233,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
@Override @Override
public List<DummyInventoryInfoEO> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) { public List<DummyInventoryInfoEO> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap()); QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap());
queryWrapper.in("dummy_inventory_base_id",dummyInventoryInfoEO.getDummyInventoryBaseId());
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(queryWrapper); List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(queryWrapper);
//技术领域处理 //技术领域处理
treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList); treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList);
@@ -769,6 +772,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
for (Map<String, String> stringStringMap : dataList) { for (Map<String, String> stringStringMap : dataList) {
DummyInventoryInfoEO dummyInventoryInfoEOTemp = JSON.parseObject(JSON.toJSONString(stringStringMap), DummyInventoryInfoEO.class); DummyInventoryInfoEO dummyInventoryInfoEOTemp = JSON.parseObject(JSON.toJSONString(stringStringMap), DummyInventoryInfoEO.class);
dummyInventoryInfoEOTemp.setCut(dummyInventoryInfoEO.getCut()); dummyInventoryInfoEOTemp.setCut(dummyInventoryInfoEO.getCut());
dummyInventoryInfoEOTemp.setDummyInventoryBaseId(dummyInventoryInfoEO.getDummyInventoryBaseId());
datas.add(dummyInventoryInfoEOTemp); datas.add(dummyInventoryInfoEOTemp);
} }
} }
@@ -1284,6 +1288,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
public void exportData(HttpServletResponse response, HttpServletRequest request, DummyInventoryInfoEO dummyInventoryInfoEO) { public void exportData(HttpServletResponse response, HttpServletRequest request, DummyInventoryInfoEO dummyInventoryInfoEO) {
List<DummyInventoryInfoEO> dataList = new ArrayList<>(); List<DummyInventoryInfoEO> dataList = new ArrayList<>();
QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,request.getParameterMap()); QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,request.getParameterMap());
queryWrapper.in("dummy_inventory_base_id",dummyInventoryInfoEO.getDummyInventoryBaseId());
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getIds())){ if(StringUtils.isNotBlank(dummyInventoryInfoEO.getIds())){
queryWrapper.in("id",Arrays.asList(dummyInventoryInfoEO.getIds().split(","))); queryWrapper.in("id",Arrays.asList(dummyInventoryInfoEO.getIds().split(",")));
} }
@@ -1444,13 +1449,29 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
*/ */
private List<OSSFile> getOssFiles(List<DummyInventoryInfoEO> dataList) { private List<OSSFile> getOssFiles(List<DummyInventoryInfoEO> dataList) {
List<String> fileIdList = new ArrayList<>(); List<String> fileIdList = new ArrayList<>();
List<String> design = dataList.stream().map(DummyInventoryInfoEO::getDesignDeliverableTemplate).collect(Collectors.toList()); List<String> design = new ArrayList<>();
List<String> prehomo = dataList.stream().map(DummyInventoryInfoEO::getPrehomoDeliverableTemplate).collect(Collectors.toList()); List<String> prehomo = new ArrayList<>();
List<String> verify = dataList.stream().map(DummyInventoryInfoEO::getVerifyDeliverableTemplate).collect(Collectors.toList()); List<String> verify = new ArrayList<>();
fileIdList.addAll(design); for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) {
fileIdList.addAll(prehomo); if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){
fileIdList.addAll(verify); design.add(dummyInventoryInfoEO.getDesignDeliverableTemplate());
}
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){
prehomo.add(dummyInventoryInfoEO.getPrehomoDeliverableTemplate());
}
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){
verify.add(dummyInventoryInfoEO.getVerifyDeliverableTemplate());
}
}
if(design.size() != 0){
fileIdList.addAll(design);
}
if(prehomo.size() != 0){
fileIdList.addAll(prehomo);
}
if(verify.size() != 0){
fileIdList.addAll(verify);
}
//查询所有的文件 //查询所有的文件
List<OSSFile> fileInfos = new ArrayList<>(); List<OSSFile> fileInfos = new ArrayList<>();
if(fileIdList.size() != 0){ if(fileIdList.size() != 0){