报价结构化

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<BaseFileNoPageVO> 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<ProjBidRatioInfoVO> projBidRatioInfoVoList = new ArrayList<>();
+
+    @ApiModelProperty(value = "中标/中选人数量")
+    private Integer bidDefiniteNumber;
+
+
 }

src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpBaseInfoVO.java

@@ -168,30 +168,6 @@ public class PurpBaseInfoVO {
     @ApiModelProperty(value = "附件列表")
     private List<BaseFileNoPageVO> 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<ProjBidRatioInfoVO> projBidRatioInfoVoList = new ArrayList<>();
-
-    @ApiModelProperty(value = "中标/中选人数量")
-    private Integer bidDefiniteNumber;
-
     @ApiModelProperty(value = "采购内容")
     private List<PurpMaterialVO> purpMaterialVOList;
 

src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java

@@ -799,22 +799,22 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
             //评价方法
             section.setEvalMethodDict(EbpProjectCommonUtil.EVAL_METHOD_MAP.get(projBaseInfoVO.getScoreType()));
             //最高限价
-            section.setPriceCeiling(purpBaseInfoVo.getPriceCeiling());
+            section.setPriceCeiling(projBaseInfoVO.getPriceCeiling());
             //最高限价说明
-            section.setPriceCeilingExplain(purpBaseInfoVo.getPriceCeilingExplain());
+            section.setPriceCeilingExplain(projBaseInfoVO.getPriceCeilingExplain());
             //是否启用结构化报价 0否；1是
-            section.setIsStructureQuote(purpBaseInfoVo.getIsStructureQuote());
+            section.setIsStructureQuote(projBaseInfoVO.getIsStructureQuote());
             //结构化报价模型 001普通报价模型
-            section.setStructureQuoteModel(purpBaseInfoVo.getStructureQuoteModel());
+            section.setStructureQuoteModel(projBaseInfoVO.getStructureQuoteModel());
             //结构化报价限价类型 001总价限制；002单价+总价限制
-            section.setStructureQuoteLimitType(purpBaseInfoVo.getStructureQuoteLimitType());
+            section.setStructureQuoteLimitType(projBaseInfoVO.getStructureQuoteLimitType());
             //中标/中选人数量是否明确 0否；1是
-            section.setBidNumberIsDefinite(purpBaseInfoVo.getBidNumberIsDefinite());
+            section.setBidNumberIsDefinite(projBaseInfoVO.getBidNumberIsDefinite());
             //中标/中选人数量
-            section.setBidDefiniteNumber(purpBaseInfoVo.getBidDefiniteNumber());
+            section.setBidDefiniteNumber(projBaseInfoVO.getBidDefiniteNumber());
 
             //中标/中选分配比例
-            bidRatioList.addAll(assembleBidRatio(record.getId(),section.getId(),purpBaseInfoVo.getProjBidRatioInfoVoList()));
+            bidRatioList.addAll(assembleBidRatio(record.getId(),section.getId(),projBaseInfoVO.getProjBidRatioInfoVoList()));
             //物资
             section.setMaterialList(assembleMaterial(record.getId(),section.getId(),purpBaseInfoVo.getPurpMaterialVOList()));
             materialList.addAll(section.getMaterialList());