From ad46dbbb38360020688b62a2e53c7084302f2180 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 18 Aug 2023 14:04:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/entity/OtaManageApplyEO.java | 13 ++++++++++--- .../service/impl/OtaManageApplyEOServiceImpl.java | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java index 7a8297bcc..ebb69b79a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java @@ -62,12 +62,12 @@ public class OtaManageApplyEO implements Serializable { @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; - @ApiModelProperty(value = "VDR") + @ApiModelProperty(value = "外键") private java.lang.String issueKey; /**项目版本*/ @Excel(name = "项目版本", width = 15) - @ApiModelProperty(value = "项目版本") + @ApiModelProperty(value = "项目版本-id") private java.lang.String projectVersion; /**认证进度*/ @@ -87,7 +87,10 @@ public class OtaManageApplyEO implements Serializable { //-------------------------------------------------------- - /**软件版本*/ + @TableField(exist = false) + @ApiModelProperty(value = "VDR") + private java.lang.String vdr; + @TableField(exist = false) @ApiModelProperty(value = "软件版本") private java.lang.String plannedBpLaunchBatch; @@ -168,6 +171,10 @@ public class OtaManageApplyEO implements Serializable { @ApiModelProperty(value = "项目版本下拉选项") private List versionVOList; + @ApiModelProperty(value = "项目版本-中文") + @TableField(exist = false) + private java.lang.String projectVersionName; + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index 12fb60300..98688b1f2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -134,6 +134,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl manageReceiveNsdpEOList = otaManageApplyEOMapper.getReleaseDate(plannedBpLaunchBatchList); for (OtaManageApplyEO manageApplyEO : otaManageApplyEOList) { + manageApplyEO.setVdr(manageApplyEO.getId()); List collect = manageReceiveNsdpEOList.stream() .filter(e -> StringUtils.isNotBlank(e.getReleaseName()) && e.getReleaseName().equals(manageApplyEO.getPlannedBpLaunchBatch())).collect(Collectors.toList());