公告结构化-接收中选原则数据

src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java

@@ -581,4 +581,10 @@ public class ProjectCommonUtil {
     public static final int PROJECT_ENTRUST_BACK_STATUS_0 = 0;
 
     public static final int PROJECT_ENTRUST_BACK_STATUS_1 = 1;
+    /**
+     * 是否启用结构化报价 0否；1是
+     */
+    public static final String PROJECT_STRUCTURE_QUOTE_0 = "0";
+
+    public static final String PROJECT_STRUCTURE_QUOTE_1 = "1";
 }

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

@@ -381,7 +381,7 @@ public class ProjBaseInfoVO{
     private List<ProjBidRatioInfoVO> projBidRatioInfoVOList = new ArrayList<>();
 
     @ApiModelProperty(value = "中标/中选人数量")
-    private Integer bidDefiniteNumber;
+    private String bidDefiniteNumber;
 
     @ApiModelProperty(value = "份额分配/(中标/中选分配原则)")
     private String shareAllocation;
@@ -389,5 +389,9 @@ public class ProjBaseInfoVO{
     @ApiModelProperty("资格条件项列表")
     private List<BizQualifyConditionItem> templateItemList;
 
+    @ApiModelProperty(value = "中标/中选数量-from")
+    private String winFrom;
 
+    @ApiModelProperty(value = "中标/中选数量-to")
+    private String winTo;
 }

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

@@ -820,8 +820,14 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
             //中标/中选人数量是否明确 0否；1是
             section.setBidNumberIsDefinite(projBaseInfoVO.getBidNumberIsDefinite());
             //中标/中选人数量
-            section.setBidDefiniteNumber(projBaseInfoVO.getBidDefiniteNumber());
+            //是报价结构化
-            //中标中选分配比例备注
+            if(section.getIsStructureQuote()!=null && section.getIsStructureQuote()==ProjectCommonUtil.PROJECT_STRUCTURE_QUOTE_1 ){
+                section.setBidDefiniteNumber(projBaseInfoVO.getBidDefiniteNumber());
+            }else{
+                //非报价结构化
+                section.setBidDefiniteNumber(projBaseInfoVO.getWinFrom()+(StringUtils.isNotBlank(projBaseInfoVO.getWinTo())?" - "+projBaseInfoVO.getWinTo():projBaseInfoVO.getWinTo()));
+            }
+            //中标中选分配比例备注，非结构化报价时 接收的是份额分配
             section.setStructureNote(projBaseInfoVO.getShareAllocation());
 
             //中标/中选分配比例

src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSection.java

@@ -268,7 +268,7 @@ public class ProjectSection extends BaseEntity implements Serializable {
     private List<BidRatio> projBidRatioInfoVoList = new ArrayList<>();
 
     @ApiModelProperty(value = "中标/中选人数量")
-    private Integer bidDefiniteNumber;
+    private String bidDefiniteNumber;
 
     @ApiModelProperty(value = "中标中选分配比例原则：中标/中选人数量是否明确为否时必填")
     private String structureNote;