diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java index 0a3b2e2..3d91e99 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java @@ -12,6 +12,7 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; /** @@ -263,9 +264,6 @@ public class ProjBaseInfoVO{ @ApiModelProperty(value = "谈判目标") private BigDecimal negotiationObjectives; - @ApiModelProperty(value = "最高限价") - private BigDecimal priceCeiling; - @ApiModelProperty(value = "标包划分") private String packageDivision; @@ -362,4 +360,30 @@ public class ProjBaseInfoVO{ @ApiModelProperty(value = "附件列表") private List baseFileNoPageVOList; + + @ApiModelProperty(value = "最高限价") + private BigDecimal priceCeiling; + + @ApiModelProperty(value = "最高限价说明") + private String priceCeilingExplain; + + @ApiModelProperty(value = "是否启用结构化报价 0否;1是") + private String isStructureQuote; + + @ApiModelProperty(value = "结构化报价模型 001普通报价模型") + private String structureQuoteModel; + + @ApiModelProperty(value = "结构化报价限价类型 001总价限制;002单价+总价限制") + private String structureQuoteLimitType; + + @ApiModelProperty(value = "中标/中选人数量是否明确 0否;1是") + private String bidNumberIsDefinite; + + @ApiModelProperty(value = "中标/中选分配比例") + private List projBidRatioInfoVoList = new ArrayList<>(); + + @ApiModelProperty(value = "中标/中选人数量") + private Integer bidDefiniteNumber; + + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpBaseInfoVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpBaseInfoVO.java index 974f125..a88933c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpBaseInfoVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpBaseInfoVO.java @@ -168,30 +168,6 @@ public class PurpBaseInfoVO { @ApiModelProperty(value = "附件列表") private List baseFileVOList; - @ApiModelProperty(value = "最高限价") - private BigDecimal priceCeiling; - - @ApiModelProperty(value = "最高限价说明") - private String priceCeilingExplain; - - @ApiModelProperty(value = "是否启用结构化报价 0否;1是") - private String isStructureQuote; - - @ApiModelProperty(value = "结构化报价模型 001普通报价模型") - private String structureQuoteModel; - - @ApiModelProperty(value = "结构化报价限价类型 001总价限制;002单价+总价限制") - private String structureQuoteLimitType; - - @ApiModelProperty(value = "中标/中选人数量是否明确 0否;1是") - private String bidNumberIsDefinite; - - @ApiModelProperty(value = "中标/中选分配比例") - private List projBidRatioInfoVoList = new ArrayList<>(); - - @ApiModelProperty(value = "中标/中选人数量") - private Integer bidDefiniteNumber; - @ApiModelProperty(value = "采购内容") private List purpMaterialVOList; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 6d21544..c81a48a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -799,22 +799,22 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl