From 968eda374b5f8b7ff3e819a6c84c7db3b4834853 Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Thu, 28 Dec 2023 11:34:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=91=8A=E7=BB=93=E6=9E=84=E5=8C=96-?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E4=B8=AD=E9=80=89=E5=8E=9F=E5=88=99=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/ebtp/project/common/ProjectCommonUtil.java    |  6 ++++++
 .../entity/ebpentity/ProjBaseInfoVO.java               |  6 +++++-
 .../service/impl/ProjectRecordServiceImpl.java         | 10 ++++++++--
 .../project/projectsection/entity/ProjectSection.java  |  2 +-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java
index 17bf757..0d3cfd5 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java
+++ b/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";
 }
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 c5dba0b..f07a8da 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
@@ -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;
 }
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 540b2a0..f3fabe4 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
@@ -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());
 
             //中标/中选分配比例
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSection.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSection.java
index ab7b9cb..b0c319b 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSection.java
+++ b/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;