From 7edccfc6374a947bd2de02b565a0411d5e7ad4a6 Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Fri, 13 Dec 2024 09:15:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=9C=80=E6=B1=82=E9=87=8D=E6=9E=84):=20?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=A7=E5=93=81=E4=B8=AD=E7=9A=84=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E8=A7=84=E6=A0=BC=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联里程碑和关联模块前端限制为必须传值 关联Issue：https://pm.gitlink.org.cn/Gitlink/projects/228/bug/124019 Signed-off-by: OTTO <731554297@qq.com> --- .../pms/product/domain/PmsProductRequirement.java | 2 +- .../pms/product/domain/vo/ProductReqSpecsDetailVo.java | 4 +--- .../pms/product/domain/vo/ProductReqSpecsInputVo.java | 2 +- .../pms/product/domain/vo/ProductReqSpecsUpdateVo.java | 8 ++++++-- .../pms/product/domain/vo/ProductUserReqUpdateVo.java | 3 ++- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/PmsProductRequirement.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/PmsProductRequirement.java index 864708cfc..495f88bde 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/PmsProductRequirement.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/PmsProductRequirement.java @@ -52,7 +52,7 @@ public class PmsProductRequirement extends BaseEntity private Long pmsProductModuleId; /** 关联产品计划ID */ - @ApiModelProperty(value = "关联产品计划ID") + @ApiModelProperty(value = "关联产品里程碑ID") private Long pmsProductPlanId; /** 关联产品标识 */ diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsDetailVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsDetailVo.java index 03a79ad0c..7c23bad47 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsDetailVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsDetailVo.java @@ -34,7 +34,7 @@ public class ProductReqSpecsDetailVo extends ProductReqSpecsDataVo { @ApiModelProperty(value = "关联项目") private PmsProject project; - @ApiModelProperty(value = "关联产品计划") + @ApiModelProperty(value = "关联产品里程碑") private PmsProductPlan pmsProductPlan; @ApiModelProperty(value = "创建人") @@ -61,6 +61,4 @@ public class ProductReqSpecsDetailVo extends ProductReqSpecsDataVo { @ApiModelProperty(value = "评审意见") private String reviewContent; - - } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsInputVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsInputVo.java index 9828a6004..da05ae494 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsInputVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsInputVo.java @@ -47,7 +47,7 @@ public class ProductReqSpecsInputVo { @ApiModelProperty(value = "产品需求类型") private String type; - @ApiModelProperty(value = "关联产品计划ID") + @ApiModelProperty(value = "关联产品里程碑ID") private Long pmsProductPlanId; diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsUpdateVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsUpdateVo.java index de92f026b..4b8975a73 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsUpdateVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsUpdateVo.java @@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; + /** * 产品需求对象 pms_product_requirement * @@ -19,13 +21,15 @@ import lombok.Data; @ApiModel("需求规格更新对象") public class ProductReqSpecsUpdateVo extends ProductReqSpecsChangeVo { - @ApiModelProperty(value = "关联产品模块ID") + @ApiModelProperty(value = "关联产品模块ID（无论用户是否修改该字段前端均需要传值，置空则传Null）", required = true) + @NotNull private Long pmsProductModuleId; @ApiModelProperty(value = "产品需求类型") private String type; - @ApiModelProperty(value = "关联产品计划ID") + @ApiModelProperty(value = "关联产品里程碑ID（无论用户是否修改该字段前端均需要传值，置空则传Null）", required = true) + @NotNull private Long pmsProductPlanId; diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqUpdateVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqUpdateVo.java index 7b6006cd5..6a43a7fae 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqUpdateVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqUpdateVo.java @@ -37,7 +37,8 @@ public class ProductUserReqUpdateVo { /** * 关联产品模块ID */ - @ApiModelProperty(value = "关联产品模块ID") + @ApiModelProperty(value = "关联产品模块ID（无论用户是否修改该字段前端均需要传值，置空则传Null）", required = true) + @NotNull private Long pmsProductModuleId; /**