虚拟清单调取列表显示
This commit is contained in:
+1
-1
@@ -456,7 +456,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
|
|||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
QueryWrapper<BussDocumentLibraryEO> queryWrapper = QueryGenerator.initQueryWrapper(bussDocumentLibraryEO, req.getParameterMap());
|
QueryWrapper<BussDocumentLibraryEO> queryWrapper = QueryGenerator.initQueryWrapper(bussDocumentLibraryEO, req.getParameterMap());
|
||||||
Page<BussDocumentLibraryEO> page = new Page<BussDocumentLibraryEO>(bussDocumentLibraryEO.getPageNo(), bussDocumentLibraryEO.getPageSize());
|
Page<BussDocumentLibraryEO> page = new Page<BussDocumentLibraryEO>(bussDocumentLibraryEO.getPageNo(), bussDocumentLibraryEO.getPageSize());
|
||||||
IPage<BussDocumentLibraryEO> pageList = bussDocumentLibraryEOService.page(page, queryWrapper);
|
IPage<BussDocumentLibraryEO> pageList = bussDocumentLibraryEOService.queryPageInfoDummy(page, queryWrapper,bussDocumentLibraryEO);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
@@ -78,6 +78,9 @@ public class BussDocumentLibraryEO implements Serializable {
|
|||||||
@ApiModelProperty(value = "对应标准")
|
@ApiModelProperty(value = "对应标准")
|
||||||
private java.lang.String correspondingStandard;
|
private java.lang.String correspondingStandard;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private java.lang.String cut;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private Integer pageNo;
|
private Integer pageNo;
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
|
|||||||
+5
@@ -1,6 +1,8 @@
|
|||||||
package com.jero.modules.document.service;
|
package com.jero.modules.document.service;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.jero.modules.document.entity.BussDocumentLibraryEO;
|
import com.jero.modules.document.entity.BussDocumentLibraryEO;
|
||||||
import com.jero.modules.document.entity.OSSFileForDocumentLibrary;
|
import com.jero.modules.document.entity.OSSFileForDocumentLibrary;
|
||||||
@@ -202,4 +204,7 @@ public interface IBussDocumentLibraryEOService extends IService<BussDocumentLibr
|
|||||||
List<String> getListBySerialNumberFuzzy(String serialNumber);
|
List<String> getListBySerialNumberFuzzy(String serialNumber);
|
||||||
|
|
||||||
List<OSSFileForDocumentLibrary> getFileInfos(String id);
|
List<OSSFileForDocumentLibrary> getFileInfos(String id);
|
||||||
|
|
||||||
|
|
||||||
|
IPage<BussDocumentLibraryEO> queryPageInfoDummy(Page<BussDocumentLibraryEO> page, QueryWrapper<BussDocumentLibraryEO> queryWrapper,BussDocumentLibraryEO bussDocumentLibraryEO);
|
||||||
}
|
}
|
||||||
|
|||||||
+52
@@ -4613,4 +4613,56 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IPage<BussDocumentLibraryEO> queryPageInfoDummy(Page<BussDocumentLibraryEO> page,
|
||||||
|
QueryWrapper<BussDocumentLibraryEO> queryWrapper,
|
||||||
|
BussDocumentLibraryEO bussDocumentLibraryEO) {
|
||||||
|
queryWrapper.orderByDesc("create_time");
|
||||||
|
IPage<BussDocumentLibraryEO> pageList = this.page(page, queryWrapper);
|
||||||
|
List<BussDocumentLibraryEO> bussDocumentLibraryEOS = this.list();
|
||||||
|
//树形数据字典
|
||||||
|
List<SysCategory> categoryList = sysCategoryService.list();
|
||||||
|
for (BussDocumentLibraryEO record : pageList.getRecords()) {
|
||||||
|
//处理对应标准
|
||||||
|
if(StringUtils.isNotBlank(record.getCorrespondingStandard())){
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
for (String correspondingStandardId : record.getCorrespondingStandard().split(",")) {
|
||||||
|
List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOS.stream()
|
||||||
|
.filter(e -> e.getId().equals(correspondingStandardId)).collect(Collectors.toList());
|
||||||
|
if(collect.size() != 0){
|
||||||
|
sb.append(collect.get(0).getCorrespondingStandard()+",");
|
||||||
|
}else{
|
||||||
|
sb.append(correspondingStandardId+",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotBlank(sb)){
|
||||||
|
String substring = sb.substring(0, sb.length() - 1);
|
||||||
|
record.setCorrespondingStandard(substring);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//处理技术领域 technology_territory
|
||||||
|
if(StringUtils.isNotBlank(record.getTechnologyTerritory())){
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
for (String technologyTerritoryId : record.getTechnologyTerritory().split(",")) {
|
||||||
|
List<SysCategory> collect = categoryList.stream().filter(e -> e.getId().equals(technologyTerritoryId)).collect(Collectors.toList());
|
||||||
|
if(collect.size() != 0){
|
||||||
|
if(CutEnum.CN.getValue().equals(bussDocumentLibraryEO.getCut())){
|
||||||
|
sb.append(collect.get(0).getName()+",");
|
||||||
|
}else{
|
||||||
|
sb.append(collect.get(0).getEnName()+",");
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
sb.append(technologyTerritoryId+",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotBlank(sb)){
|
||||||
|
String substring = sb.substring(0, sb.length() - 1);
|
||||||
|
record.setTechnologyTerritory(substring);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return pageList;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user