WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加字段

Browse Source
This commit is contained in:
zhn
2023-08-18 14:04:58 +08:00
parent 77f9b7a460
commit ad46dbbb38
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java
+10 -3
View File
@@ -62,12 +62,12 @@ public class OtaManageApplyEO implements Serializable {
@ApiModelProperty(value = "所属部门") @ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode; private java.lang.String sysOrgCode;
@ApiModelProperty(value = "VDR") @ApiModelProperty(value = "外键")
private java.lang.String issueKey; private java.lang.String issueKey;
/**项目版本*/ /**项目版本*/
@Excel(name = "项目版本", width = 15) @Excel(name = "项目版本", width = 15)
@ApiModelProperty(value = "项目版本") @ApiModelProperty(value = "项目版本-id")
private java.lang.String projectVersion; 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) @TableField(exist = false)
@ApiModelProperty(value = "软件版本") @ApiModelProperty(value = "软件版本")
private java.lang.String plannedBpLaunchBatch; private java.lang.String plannedBpLaunchBatch;
@@ -168,6 +171,10 @@ public class OtaManageApplyEO implements Serializable {
@ApiModelProperty(value = "项目版本下拉选项") @ApiModelProperty(value = "项目版本下拉选项")
private List<VersionVO> versionVOList; private List<VersionVO> versionVOList;
@ApiModelProperty(value = "项目版本-中文")
@TableField(exist = false)
private java.lang.String projectVersionName;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+1
View File
@@ -134,6 +134,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
if(!plannedBpLaunchBatchList.isEmpty()){ if(!plannedBpLaunchBatchList.isEmpty()){
List<OtaManageReceiveNsdpEO> manageReceiveNsdpEOList = otaManageApplyEOMapper.getReleaseDate(plannedBpLaunchBatchList); List<OtaManageReceiveNsdpEO> manageReceiveNsdpEOList = otaManageApplyEOMapper.getReleaseDate(plannedBpLaunchBatchList);
for (OtaManageApplyEO manageApplyEO : otaManageApplyEOList) { for (OtaManageApplyEO manageApplyEO : otaManageApplyEOList) {
manageApplyEO.setVdr(manageApplyEO.getId());
List<OtaManageReceiveNsdpEO> collect = manageReceiveNsdpEOList.stream() List<OtaManageReceiveNsdpEO> collect = manageReceiveNsdpEOList.stream()
.filter(e -> StringUtils.isNotBlank(e.getReleaseName()) .filter(e -> StringUtils.isNotBlank(e.getReleaseName())
&& e.getReleaseName().equals(manageApplyEO.getPlannedBpLaunchBatch())).collect(Collectors.toList()); && e.getReleaseName().equals(manageApplyEO.getPlannedBpLaunchBatch())).collect(Collectors.toList());