From bd414769128c61f0edbcf0a4b44f5829472207df Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 27 Dec 2022 14:46:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8E=8B=E7=BC=A9=E5=8C=85=E4=B8=ADexcel=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=20=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E4=BD=BF=E7=94=A8=E5=9C=B0?= =?UTF-8?q?=E5=8C=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsExportTemplateEOController.java | 46 ++++++++++++++++++- .../report/entity/ParamsExportTemplateEO.java | 6 +++ .../entity/ProjectLawsInventoryEO.java | 4 ++ .../ProjectLawsInventoryEOServiceImpl.java | 13 +++--- 4 files changed, 61 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java index 259554efa..c1621e5fc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java @@ -5,11 +5,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.vo.DictModel; import com.jero.modules.cert.report.entity.ParamsExportTemplateEO; import com.jero.modules.cert.report.enums.ExportTemplateStateEnum; import com.jero.modules.cert.report.service.IParamsExportTemplateEOService; import com.jero.modules.ocr.util.LineHumpUtil; +import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,9 +26,11 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -40,7 +46,9 @@ import java.util.Map; public class ParamsExportTemplateEOController extends JeroController { @Autowired private IParamsExportTemplateEOService paramsExportTemplateEOService; - + @Autowired + private ISysDictService sysDictService; + /** * 分页列表查询 * @@ -76,13 +84,47 @@ public class ParamsExportTemplateEOController extends JeroController rows = pageList.getRecords(); Map stateMap = ExportTemplateStateEnum.toMap(cut); + List regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); rows.forEach(exportTemplateEO -> { exportTemplateEO.setState_dictText(stateMap.get(exportTemplateEO.getState())); + //处理适用地区 + String region = getRegion(paramsExportTemplateEO, regionList, exportTemplateEO); + if(StringUtils.isNotBlank(region)){ + exportTemplateEO.setRegion_dictText(region); + } }); return Result.OK(pageList); } - /** + private String getRegion(ParamsExportTemplateEO paramsExportTemplateEO, List regionList, ParamsExportTemplateEO exportTemplateEO) { + //适用地区 + List dictModelList = new ArrayList<>(); + String region = ""; + if(StringUtils.isNotBlank(exportTemplateEO.getRegion())){ + for (String s : exportTemplateEO.getRegion().split(",")) { + List dictModelListTemp = regionList.stream() + .filter(e -> s.equals(e.getValue())).collect(Collectors.toList()); + dictModelList.addAll(dictModelListTemp); + } + + if(dictModelList.size() != 0){ + StringBuilder sb = new StringBuilder(); + for (DictModel dictModel : dictModelList) { + if(CutEnum.CN.getValue().equals(paramsExportTemplateEO.getCut())){ + sb.append(dictModel.getText()+","); + }else{ + sb.append(dictModel.getTextEn()+","); + } + } + if(StringUtils.isNotBlank(sb)){ + region = sb.substring(0,sb.length()-1); + } + } + } + return region; + } + + /** * 列表查询 * * @return diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java index 35e411dce..fcce32d27 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java @@ -74,6 +74,12 @@ public class ParamsExportTemplateEO implements Serializable { @ApiModelProperty(value = "内容说明") private String description; + /**适用地区*/ + @ApiModelProperty(value = "适用地区") + private String region; + @TableField(exist = false) + private String region_dictText; + /**附件上传*/ @Excel(name = "附件上传", width = 15) @ApiModelProperty(value = "附件上传") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 838f0ec28..c4a643ca0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -468,4 +468,8 @@ public class ProjectLawsInventoryEO implements Serializable { @ApiModelProperty(value = "文档库id/标准id") private String standId; + @ApiModelProperty(value = "导出的excel的名称") + @TableField(exist = false) + private String excelName; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 1ceb1f0d4..19bec1aa7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -4450,12 +4450,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl