From 2d78d852e5523bf277ebff9db80f00cc7e8f065e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 14 Apr 2022 12:00:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95--=E5=88=86?= =?UTF-8?q?=E9=A1=B5(=E6=8A=80=E6=9C=AF=E9=A2=86=E5=9F=9F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOController.java | 2 +- .../DummyInventoryInfoEOController.java | 11 +-- .../dummy/entity/DummyInventoryInfoEO.java | 14 ++++ .../service/IDummyInventoryInfoEOService.java | 3 + .../impl/DummyInventoryInfoEOServiceImpl.java | 68 +++++++++++++++++++ 5 files changed, 88 insertions(+), 10 deletions(-) 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 5cb95dac2..5d37896d9 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 @@ -142,7 +142,7 @@ public class BussDocumentLibraryEOController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(id); if(bussDocumentLibraryEO==null) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java index 757746af7..9b4dda171 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java @@ -48,21 +48,14 @@ public class DummyInventoryInfoEOController extends JeroController queryPageList(DummyInventoryInfoEO dummyInventoryInfoEO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = dummyInventoryInfoEOService.page(page, queryWrapper); + public Result queryPageList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) { + IPage pageList = dummyInventoryInfoEOService.getPageInfo(dummyInventoryInfoEO,req); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java index 4fd9a5884..5f6e9387f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java @@ -93,6 +93,9 @@ public class DummyInventoryInfoEO implements Serializable { @ApiModelProperty(value = "技术领域") private java.lang.String technologyTerritory; + @TableField(exist = false) + private java.lang.String technologyTerritoryName; + /**新车型实施日期*/ @Excel(name = "新车型实施日期", width = 15) @ApiModelProperty(value = "新车型实施日期") @@ -125,21 +128,25 @@ public class DummyInventoryInfoEO implements Serializable { /**实施类别*/ @Excel(name = "实施类别", width = 15) @ApiModelProperty(value = "实施类别") + @Dict(dicCode ="implement_type") private java.lang.String implementType; /**认证类型*/ @Excel(name = "认证类型", width = 15) @ApiModelProperty(value = "认证类型") + @Dict(dicCode ="attestation_type") private java.lang.String attestationType; /**认证级别*/ @Excel(name = "认证级别", width = 15) @ApiModelProperty(value = "认证级别") + @Dict(dicCode ="attestation_rank") private java.lang.String attestationRank; /**责任领域*/ @Excel(name = "责任领域", width = 15) @ApiModelProperty(value = "责任领域") + @Dict(dicCode ="duty_territory") private java.lang.String dutyTerritory; /**备注*/ @@ -150,6 +157,7 @@ public class DummyInventoryInfoEO implements Serializable { /**设计符合性确认-交付物类型*/ @Excel(name = "设计符合性确认-交付物类型", width = 15) @ApiModelProperty(value = "设计符合性确认-交付物类型") + @Dict(dicCode ="deliverable_template") private java.lang.String designDeliverableType; /**设计符合性确认-交付物模板*/ @@ -214,4 +222,10 @@ public class DummyInventoryInfoEO implements Serializable { @TableField(exist = false) private String ids; + @TableField(exist = false) + private Integer pageNo; + + @TableField(exist = false) + private Integer pageSize; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java index d6ca908a4..08d8bd6f0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java @@ -1,5 +1,6 @@ package com.jero.modules.dummy.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import com.baomidou.mybatisplus.extension.service.IService; @@ -64,6 +65,8 @@ public interface IDummyInventoryInfoEOService extends IService queryList(); + IPage getPageInfo(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req); + /** * 批量设置 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 3524b4d16..694fe5f6d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1,12 +1,19 @@ package com.jero.modules.dummy.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import com.jero.modules.dummy.mapper.DummyInventoryInfoEOMapper; import com.jero.modules.dummy.service.IDummyInventoryInfoEOService; +import com.jero.modules.system.entity.SysCategory; +import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -17,8 +24,11 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; +import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.UUID; +import java.util.stream.Collectors; /** * @Description: 虚拟清单详情表 @@ -32,6 +42,23 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl getPageInfo(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO, req.getParameterMap()); + Page page = new Page(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize()); + IPage pageInfo = this.page(page, queryWrapper); + + //技术领域处理 + treeDict(dummyInventoryInfoEO, pageInfo); + return pageInfo; + } + + + /** * 保存 * @@ -40,6 +67,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.in(BussDocumentLibraryEO::getId, Arrays.asList(dummyInventoryInfoEO.getIds().split(","))); @@ -145,4 +173,44 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl pageInfo) { + Set technologyTerritorySet = new HashSet<>(); + for (DummyInventoryInfoEO record : pageInfo.getRecords()) { + if(StringUtils.isNotBlank(record.getTechnologyTerritory())){ + List list = Arrays.asList(record.getTechnologyTerritory().split(",")); + technologyTerritorySet.addAll(list); + } + } + //树形结构数据字典(技术领域) + if(technologyTerritorySet.size() != 0){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SysCategory::getId,technologyTerritorySet); + List categoryList = sysCategoryService.list(wrapper); + for (DummyInventoryInfoEO record : pageInfo.getRecords()) { + if(StringUtils.isNotBlank(record.getTechnologyTerritory())){ + List technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(",")); + StringBuilder sb = new StringBuilder(); + for (String technologyTerritory : technologyTerritoryList) { + List collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList()); + if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ + sb.append(collect.get(0).getName() + ","); + }else{ + sb.append(collect.get(0).getEnName()); + } + } + String technologyTerritoryName = ""; + if(StringUtils.isNotBlank(sb)){ + technologyTerritoryName = sb.substring(0, sb.length() - 1); + } + record.setTechnologyTerritoryName(technologyTerritoryName); + } + } + } + } }