From 9e2773e659d88abf1c83f21938246562118f719d Mon Sep 17 00:00:00 2001
From: "517612449@qq.com" <liuhao1234>
Date: Tue, 27 Sep 2022 15:33:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A2=E4=BB=B7=E5=A7=94=E6=89=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=A0=87=E7=9A=84=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E5=8D=95=E4=B8=AA=E6=95=B0=E5=AD=97=EF=BC=8C?=
 =?UTF-8?q?=E7=8E=B0=E5=A4=9A=E4=B8=AA=E5=AD=97=E7=AC=A6=E4=B8=B2=E9=80=97?=
 =?UTF-8?q?=E5=8F=B7=E5=88=86=E5=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/ebtp/project/common/InquiryCommonUtil.java       | 8 ++++----
 .../projectentrust/entity/inquiryentity/InquiryVO.java    | 2 +-
 .../service/impl/ProjectEntrustInquiryServiceImpl.java    | 6 +++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java
index 8947736..247d40f 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java
@@ -35,17 +35,17 @@ public class InquiryCommonUtil {
     /**
      * 标的类型：1货物
      */
-    public static final int BID_TYPE_1 = 1;
+    public static final String BID_TYPE_1 = "1";
 
     /**
      * 标的类型：2服务
      */
-    public static final int BID_TYPE_2 = 2;
+    public static final String BID_TYPE_2 = "2";
 
     /**
      * 标的类型：3施工服务
      */
-    public static final int BID_TYPE_3 = 3;
+    public static final String BID_TYPE_3 = "3";
 
     /**
      * 是否委托招标代理 否
@@ -84,7 +84,7 @@ public class InquiryCommonUtil {
     /**
      * 采购类型转换 MAP
      */
-    public static final Map<Integer, String> BID_TYPE_MAP = new HashMap<Integer, String>() {{
+    public static final Map<String, String> BID_TYPE_MAP = new HashMap<String, String>() {{
         put(BID_TYPE_1, ProjectCommonUtil.PROCUREMENT_TYPE_1);
         put(BID_TYPE_2, ProjectCommonUtil.PROCUREMENT_TYPE_2);
         put(BID_TYPE_3, ProjectCommonUtil.PROCUREMENT_TYPE_3);
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryVO.java
index 9c08681..ea53b9b 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryVO.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryVO.java
@@ -548,7 +548,7 @@ public class InquiryVO implements Serializable {
     private String executorApproveStatus;
 
     @ApiModelProperty(value = "标的类型：1货物 2服务 3施工服务")
-    private Integer bidType;
+    private String bidType;
 
     @ApiModelProperty(value = "5g创新业务，0不是,1是")
     private Integer isFifthGPrefecture;
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java
index ffeec1d..ace9a7e 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java
@@ -31,7 +31,11 @@ import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 项目询价serviceImpl
@@ -195,7 +199,7 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl<ProjectEnt
         //代理公司名称/代理机构名称
         result.setAgencyCompanyName(inquiryVO.getDelegationName());
         //采购类型
-        result.setProcurementType(InquiryCommonUtil.BID_TYPE_MAP.get(inquiryVO.getBidType()));
+        result.setProcurementType(Stream.of(inquiryVO.getBidType().split(",")).map(InquiryCommonUtil.BID_TYPE_MAP::get).collect(Collectors.joining(",")));
         //采购方式
         result.setProcurementMode(InquiryCommonUtil.BUY_WAY_MAP.get(inquiryVO.getBuyWay()));
         //组织方式