From 543e2359dc7881ca265ef135d82e188867d6519a Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Fri, 29 Dec 2023 00:44:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E7=BB=93=E6=9E=84=E5=8C=96-?=
 =?UTF-8?q?=E4=B8=AD=E6=A0=87=E4=BA=BA=E6=95=B0=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectRecordServiceImpl.java     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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 f3fabe4..8a6ea73 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
@@ -821,11 +821,21 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
             section.setBidNumberIsDefinite(projBaseInfoVO.getBidNumberIsDefinite());
             //中标/中选人数量
             //是报价结构化
-            if(section.getIsStructureQuote()!=null && section.getIsStructureQuote()==ProjectCommonUtil.PROJECT_STRUCTURE_QUOTE_1 ){
+            if(section.getIsStructureQuote()!=null && section.getIsStructureQuote().equals(ProjectCommonUtil.PROJECT_STRUCTURE_QUOTE_1 )){
                 section.setBidDefiniteNumber(projBaseInfoVO.getBidDefiniteNumber());
             }else{
                 //非报价结构化
-                section.setBidDefiniteNumber(projBaseInfoVO.getWinFrom()+(StringUtils.isNotBlank(projBaseInfoVO.getWinTo())?" - "+projBaseInfoVO.getWinTo():projBaseInfoVO.getWinTo()));
+                String numString=null;
+                if(StringUtils.isNotBlank(projBaseInfoVO.getWinFrom())){
+                    numString=projBaseInfoVO.getWinFrom();
+                }
+                if(StringUtils.isNotBlank(projBaseInfoVO.getWinFrom()) && StringUtils.isNotBlank(projBaseInfoVO.getWinTo())){
+                    numString=numString+" - ";
+                }
+                if(StringUtils.isNotBlank(projBaseInfoVO.getWinTo())){
+                    numString=projBaseInfoVO.getWinTo();
+                }
+                section.setBidDefiniteNumber(numString);
             }
             //中标中选分配比例备注，非结构化报价时 接收的是份额分配
             section.setStructureNote(projBaseInfoVO.getShareAllocation());