From e3961af17d1b605e838af223f7e0c0aaec30077d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 26 Apr 2022 17:51:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E5=8F=96=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOController.java | 2 +- .../entity/BussDocumentLibraryEO.java | 3 ++ .../IBussDocumentLibraryEOService.java | 5 ++ .../BussDocumentLibraryEOServiceImpl.java | 52 +++++++++++++++++++ 4 files changed, 61 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index 2982c57e0..d4391e03a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -456,7 +456,7 @@ public class BussDocumentLibraryEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(bussDocumentLibraryEO, req.getParameterMap()); Page page = new Page(bussDocumentLibraryEO.getPageNo(), bussDocumentLibraryEO.getPageSize()); - IPage pageList = bussDocumentLibraryEOService.page(page, queryWrapper); + IPage pageList = bussDocumentLibraryEOService.queryPageInfoDummy(page, queryWrapper,bussDocumentLibraryEO); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java index 8f8a9d2b3..3a1bf5998 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java @@ -78,6 +78,9 @@ public class BussDocumentLibraryEO implements Serializable { @ApiModelProperty(value = "对应标准") private java.lang.String correspondingStandard; + @TableField(exist = false) + private java.lang.String cut; + @TableField(exist = false) private Integer pageNo; @TableField(exist = false) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java index 1ccb5db1d..9900b0118 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -1,6 +1,8 @@ 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.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.entity.OSSFileForDocumentLibrary; @@ -202,4 +204,7 @@ public interface IBussDocumentLibraryEOService extends IService getListBySerialNumberFuzzy(String serialNumber); List getFileInfos(String id); + + + IPage queryPageInfoDummy(Page page, QueryWrapper queryWrapper,BussDocumentLibraryEO bussDocumentLibraryEO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 1f9d723fe..d9d268fae 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -4613,4 +4613,56 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl queryPageInfoDummy(Page page, + QueryWrapper queryWrapper, + BussDocumentLibraryEO bussDocumentLibraryEO) { + queryWrapper.orderByDesc("create_time"); + IPage pageList = this.page(page, queryWrapper); + List bussDocumentLibraryEOS = this.list(); + //树形数据字典 + List categoryList = sysCategoryService.list(); + for (BussDocumentLibraryEO record : pageList.getRecords()) { + //处理对应标准 + if(StringUtils.isNotBlank(record.getCorrespondingStandard())){ + StringBuilder sb = new StringBuilder(); + for (String correspondingStandardId : record.getCorrespondingStandard().split(",")) { + List 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 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; + } + }