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 BID_TYPE_MAP = new HashMap() {{ + public static final Map BID_TYPE_MAP = new HashMap() {{ 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