From d97dbd0d122d74c27f25b2e356e2058c36158234 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 1 Feb 2024 11:28:00 +0800 Subject: [PATCH] =?UTF-8?q?fix=2081419=20=E4=B8=93=E9=A1=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93-=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LawsAssessController.java | 25 +++--- .../LawsSpecialProjectLibraryController.java | 13 +++- .../entity/LawsSpecialProjectLibrary.java | 18 ++++- .../LawsSpecialProjectLibraryMapper.java | 5 +- .../xml/LawsSpecialProjectLibraryMapper.xml | 77 +++++++++++++++++++ .../LawsSpecialProjectLibraryServiceImpl.java | 29 ++++++- 6 files changed, 145 insertions(+), 22 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java index e53167cf..4e345d8d 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java @@ -236,21 +236,24 @@ public class LawsAssessController extends JeroController dos = null; - String selections = request.getParameter("selections"); - if (StringUtils.isNotBlank(selections)) { - dos = lawsAssessService.listByIds(Arrays.asList(selections.split(","))); - } else { - lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsAssess, request.getParameterMap()); - dos = lawsAssessService.list(queryWrapper); - } + lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsAssess, request.getParameterMap()); + List dos = lawsAssessService.list(queryWrapper); + if (dos.isEmpty()) { throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); } - lawsAssessService.assignment(dos); + List exportList; + String selections = request.getParameter("selections"); + if (StringUtils.isNotBlank(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + exportList = dos.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + }else { + exportList = dos; + } + lawsAssessService.assignment(exportList); String title = "法规清单"; - return super.exportListXls(dos, LawsAssess.class, title); + return super.exportListXls(exportList, LawsAssess.class, title); } } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsSpecialProjectLibraryController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsSpecialProjectLibraryController.java index 6cb3bc51..0396dc64 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsSpecialProjectLibraryController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsSpecialProjectLibraryController.java @@ -3,6 +3,7 @@ package com.jero.modules.projectLibrary.controller; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; @@ -153,7 +154,17 @@ public class LawsSpecialProjectLibraryController extends JeroController pageList = lawsSpecialProjectLibraryService.queryPage(lawsSpecialProjectLibrary, -1, -1, request); + List records = pageList.getRecords(); + List exportList; + String selections = request.getParameter("selections"); + if (StringUtils.isNotBlank(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + exportList = records.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + }else { + exportList = records; + } + return super.exportListXls(exportList, LawsSpecialProjectLibrary.class, "专项项目库"); } } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java index fa0d74ac..f3036c50 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java @@ -2,7 +2,10 @@ package com.jero.modules.projectLibrary.entity; import java.io.Serializable; import java.util.Date; +import java.util.List; + import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.jero.common.aspect.annotation.Dict; @@ -80,10 +83,10 @@ public class LawsSpecialProjectLibrary implements Serializable { /**标准类型(1-国内、2-海外、3-企标)*/ @ApiModelProperty(value = "标准类型(1-国内、2-海外、3-企标)") private String standardType; - /**标准状态(1-草案、2-征求意见稿、3-送审稿、4-报批稿、5-发布稿、5-修改单)*/ - @Dict(dicCode = "decomposition_order_source") - @Excel(name = "标准状态", width = 15, dicCode = "decomposition_order_source") - @ApiModelProperty(value = "标准状态(1-草案、2-征求意见稿、3-送审稿、4-报批稿、5-发布稿、5-修改单)") + /**标准状态*/ + @Excel(name = "标准状态", width = 15, dicCode = "standard_state") + @ApiModelProperty(value = "标准状态") + @Dict(dicCode = "standard_state") private String standardState; /**车型系列*/ @Excel(name = "车型系列", width = 15, dicCode = "model_series") @@ -129,5 +132,12 @@ public class LawsSpecialProjectLibrary implements Serializable { /**流程关联条款id*/ @ApiModelProperty(value = "流程关联条款id") private String processTermId; + /**排序字段*/ + @ApiModelProperty(value = "排序字段") + private String column; + /**排序方式*/ + @ApiModelProperty(value = "排序方式") + private String order; + } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/LawsSpecialProjectLibraryMapper.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/LawsSpecialProjectLibraryMapper.java index 2d423a51..45cd9d0d 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/LawsSpecialProjectLibraryMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/LawsSpecialProjectLibraryMapper.java @@ -1,7 +1,7 @@ package com.jero.modules.projectLibrary.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import com.jero.modules.projectLibrary.entity.LawsSpecialProjectLibrary; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface LawsSpecialProjectLibraryMapper extends BaseMapper { + Page pageList(Page page,@Param("obj") LawsSpecialProjectLibrary lawsSpecialProjectLibrary); } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsSpecialProjectLibraryMapper.xml b/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsSpecialProjectLibraryMapper.xml index 04ba9704..6322b650 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsSpecialProjectLibraryMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsSpecialProjectLibraryMapper.xml @@ -25,5 +25,82 @@ + + + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsSpecialProjectLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsSpecialProjectLibraryServiceImpl.java index a22dfd1e..de8dae34 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsSpecialProjectLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsSpecialProjectLibraryServiceImpl.java @@ -1,16 +1,28 @@ package com.jero.modules.projectLibrary.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.constant.CommonConstant; +import com.jero.modules.laws.standard.entity.LawsDomesticStandard; +import com.jero.modules.laws.standard.entity.LawsOverseasStandard; +import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; +import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.projectLibrary.entity.LawsSpecialProjectLibrary; import com.jero.modules.projectLibrary.mapper.LawsSpecialProjectLibraryMapper; import com.jero.modules.projectLibrary.service.ILawsSpecialProjectLibraryService; +import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.util.Strings; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; + +import java.util.Arrays; import java.util.List; import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.query.QueryGenerator; + +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -25,7 +37,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @Service @Transactional(rollbackFor = JeroBootException.class) public class LawsSpecialProjectLibraryServiceImpl extends ServiceImpl implements ILawsSpecialProjectLibraryService { - + @Autowired + private ILawsDomesticStandardService lawsDomesticStandardService; //国内标准 + @Autowired + private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准 + @Resource + private LawsSpecialProjectLibraryMapper specialProjectLibraryMapper; /** * 分页查询 @@ -39,9 +56,13 @@ public class LawsSpecialProjectLibraryServiceImpl extends ServiceImpl queryPage(LawsSpecialProjectLibrary lawsSpecialProjectLibrary, Integer pageNo, Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsSpecialProjectLibrary, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); + String modelSeries = lawsSpecialProjectLibrary.getModelSeries(); + if (StringUtils.isNotBlank(modelSeries)){ + lawsSpecialProjectLibrary.setModelSeries(Strings.join(Arrays.asList(modelSeries.split(",")),'|')); + } + Page page = new Page<>(pageNo, pageSize); + Page pageList = specialProjectLibraryMapper.pageList(page, lawsSpecialProjectLibrary); + return pageList; } /**