From 42379645b90932af7eb12f2e16c72a042cc51f63 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 17 Jan 2024 16:10:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95--=E8=AE=BE=E7=BD=AE=E5=8F=82=E8=80=83?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 13 +++++++++++- .../impl/ParamsManifestEOServiceImpl.java | 2 +- .../controller/ParamsReportEOController.java | 20 +++++++++++++++++++ .../cert/report/entity/ParamsReportEO.java | 6 ++++++ .../dialog/parametercolumn.vue | 2 +- 5 files changed, 40 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 368538277..bb73d3119 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1937,6 +1937,16 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl projectLibraryBaseList = projectLibraryBaseService.queryById(paramsManifestEO.getProjectId(), cut); +// if(ObjectUtils.isNotEmpty(projectLibraryBaseList)){ +// if(StringUtils.isBlank(projectLibraryBaseList.get(0).getProjectVersion())){ +// projectName = projectLibraryBaseList.get(0).getProjectName()+"-00"; +// }else{ +// projectName = projectLibraryBaseList.get(0).getProjectName()+"-"+projectLibraryBaseList.get(0).getProjectVersion(); +// } +// } + + List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); List> listConfig = new LinkedList<>(); for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) { @@ -2006,7 +2016,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl regionList, String targetMarket) { + public String getTargetMarket(String cut, List regionList, String targetMarket) { //适用地区 List dictModelList = new ArrayList<>(); String region = ""; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index 0bf1893dd..c0679c874 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -10,6 +10,7 @@ import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.cert.collect.service.IParamsConfigDataEOService; import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService; +import com.jero.modules.cert.collect.service.impl.ParamsManifestEOServiceImpl; import com.jero.modules.cert.report.entity.ParamsReportConfigEO; import com.jero.modules.cert.report.entity.ParamsReportEO; import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO; @@ -86,6 +87,8 @@ public class ParamsReportEOController extends JeroController rows = pageList.getRecords(); +// List regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); for (ParamsReportEO row : rows) { + // +// String targetMarket = ""; +// if(CutEnum.CN.getValue().equals(paramsReportEO.getCut())){ +// targetMarket = paramsManifestEOService.getTargetMarket(CutEnum.CN.getValue(), regionList, row.getTargetMarket()); +// }else{ +// targetMarket = paramsManifestEOService.getTargetMarket(CutEnum.EN.getValue(), regionList, row.getTargetMarket()); +// } +// row.setTargetMarketName(targetMarket); + String version = ""; + if(StringUtils.isBlank(row.getProjectVersion())){ + version = "00"; + }else{ + version = row.getProjectVersion(); + } + row.setProjectNameAll(row.getProjectName() + "-" +row.getTargetMarket()+"-"+version); + // 项目名称-国家-清单名称 row.setPageName(row.getProjectName() + "-" + row.getTargetMarket() + "-" + row.getTitle()); // 设置配置 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java index f50b42861..95e17bff8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java @@ -75,12 +75,18 @@ public class ParamsReportEO implements Serializable { @ApiModelProperty(value = "项目名称") private String projectName; + private String projectNameAll; + @ApiModelProperty(value = "清单标题") private String title; @ApiModelProperty(value = "目标市场") private String targetMarket; + @ApiModelProperty(value = "目标市场中英文转换") + @TableField(exist = false) + private String targetMarketName; + @ApiModelProperty(value = "相关项目版本") private String projectVersion; diff --git a/jero-web/src/views/projectManagement/dialog/parametercolumn.vue b/jero-web/src/views/projectManagement/dialog/parametercolumn.vue index 84b89eeb6..995b4f786 100644 --- a/jero-web/src/views/projectManagement/dialog/parametercolumn.vue +++ b/jero-web/src/views/projectManagement/dialog/parametercolumn.vue @@ -312,7 +312,7 @@ let postDate = { paramsReportId: this.selectedRowKeys[0], paramsReportConfigId: this.selectedRowKeysDate[0].configure, - paramsReportConfigName:this.paramsReportConfigName, + paramsReportConfigName:this.selectedRowKeysDate[0].projectNameAll + ' ' + this.paramsReportConfigName, paramsManifestId:this.$route.query.id, } //新增