liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

询价委托修改标的类型字段，原单个数字，现多个字符串逗号分割

Browse Source
This commit is contained in:
517612449@qq.com
2022-09-27 15:33:06 +08:00
parent 3642968c98
commit 9e2773e659
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java
View File

@ -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);

2
src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryVO.java
View File

@ -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;

6
src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java
View File

@ -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()));
//组织方式