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

Merge branch 'uat_新采购方式改造20240926'

Browse Source
This commit is contained in:
zhangqinbin
2025-01-03 15:50:31 +08:00
parent d67a6c1978 e80a1fc6c1
commit a555a1042e
3 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/chinaunicom/mall/ebtp/project/common/EbpProjectCommonUtil.java
View File

@ -51,20 +51,33 @@ public class EbpProjectCommonUtil {
*/
public static final String PURC_MODE_002 = "002";
/**
* 采购方式 003 竞争性谈判
*/
public static final String PURC_MODE_003 = "003";
/**
* 谈判采购
*/
public static final String PURC_MODE_023 = "023";
/**
* 采购方式 004 单一来源采购
*/
public static final String PURC_MODE_004 = "004";
/**
* 直接采购
*/
public static final String PURC_MODE_024 = "024";
/**
* 采购方式 005 公开比选
*/
public static final String PURC_MODE_005 = "005";
/**
* 022询比采购
*/
public static final String PURC_MODE_022 = "022";
/**
* 001 货物 标的类型
@ -95,6 +108,10 @@ public class EbpProjectCommonUtil {
* 比选方式 002 多阶段评审
*/
public static final String COMPAR_SELECT_MODE_002 = "002";
/**
* 询比采购使用的比方方式 003 两阶段 ->selection_method_2
*/
public static final String COMPAR_SELECT_MODE_003 = "003";
/**
* 资审方式 001 预审
@ -233,8 +250,11 @@ public class EbpProjectCommonUtil {
put(PURC_MODE_001, ProjectCommonUtil.PROCUREMENT_MODE_1);
put(PURC_MODE_002, ProjectCommonUtil.PROCUREMENT_MODE_2);
put(PURC_MODE_003, ProjectCommonUtil.PROCUREMENT_MODE_5);
put(PURC_MODE_023, ProjectCommonUtil.PROCUREMENT_MODE_15);
put(PURC_MODE_004, ProjectCommonUtil.PROCUREMENT_MODE_6);
put(PURC_MODE_024, ProjectCommonUtil.PROCUREMENT_MODE_16);
put(PURC_MODE_005, ProjectCommonUtil.PROCUREMENT_MODE_3);
put(PURC_MODE_022, ProjectCommonUtil.PROCUREMENT_MODE_13);
}};
/**
@ -255,6 +275,7 @@ public class EbpProjectCommonUtil {
public static final Map<String, String> SELECTION_METHOD_MAP = new HashMap<String, String>() {{
put(COMPAR_SELECT_MODE_001, ProjectCommonUtil.SELECTION_METHOD_1);
put(COMPAR_SELECT_MODE_002, ProjectCommonUtil.SELECTION_METHOD_2);
put(COMPAR_SELECT_MODE_003, ProjectCommonUtil.SELECTION_METHOD_2);
}};
/**

10
src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java
View File

@ -257,6 +257,8 @@ public class ProjectCommonUtil {
* 项目采购方式 公开比选
*/
public static final String PROCUREMENT_MODE_3 = "procurement_mode_3";
//询比采购
public static final String PROCUREMENT_MODE_13 = "procurement_mode_13";
/**
* 项目采购方式 公开招募
@ -267,11 +269,17 @@ public class ProjectCommonUtil {
* 项目采购方式 竞争性谈判
*/
public static final String PROCUREMENT_MODE_5 = "procurement_mode_5";
/**
* 谈判
*/
public static final String PROCUREMENT_MODE_15 = "procurement_mode_15";
/**
* 项目采购方式 单一来源
*/
public static final String PROCUREMENT_MODE_6 = "procurement_mode_6";
//直接采购
public static final String PROCUREMENT_MODE_16 = "procurement_mode_16";
/**
* 项目采购方式 公开询价
@ -556,7 +564,7 @@ public class ProjectCommonUtil {
public static final Map<String,String[]> PROCUREMENT_MODE_MAP = new HashMap<String,String[]>(){{
String[] biddingArray = {PROCUREMENT_MODE_1,PROCUREMENT_MODE_2};
String[] recruitArray = {PROCUREMENT_MODE_4};
String[] negotiationArray = {PROCUREMENT_MODE_5,PROCUREMENT_MODE_6};
String[] negotiationArray = {PROCUREMENT_MODE_5,PROCUREMENT_MODE_15,PROCUREMENT_MODE_6,PROCUREMENT_MODE_16};
//招标
this.put("01",biddingArray);
//招募

11
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
View File

@ -474,8 +474,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
case ProjectCommonUtil.PROCUREMENT_MODE_1:isInvitation = StringUtils.equals(projectRecord.getExaminationMethodDict(),ProjectCommonUtil.EXAMINATION_METHOD_4);break;
//竞争性谈判 邀请参与
case ProjectCommonUtil.PROCUREMENT_MODE_5:isInvitation = StringUtils.equals(projectRecord.getExaminationMethodDict(),ProjectCommonUtil.PARTAKE_TYPE_1);break;
case ProjectCommonUtil.PROCUREMENT_MODE_15:isInvitation = StringUtils.equals(projectRecord.getExaminationMethodDict(),ProjectCommonUtil.PARTAKE_TYPE_1);break;
//单一来源
case ProjectCommonUtil.PROCUREMENT_MODE_6:isInvitation = !StringUtils.equals(projectRecord.getIsApproval(),ProjectCommonUtil.IS_APPROVAL_1);break;
case ProjectCommonUtil.PROCUREMENT_MODE_16:isInvitation = !StringUtils.equals(projectRecord.getIsApproval(),ProjectCommonUtil.IS_APPROVAL_1);break;
//邀请招标
case ProjectCommonUtil.PROCUREMENT_MODE_2:
//询价
@ -699,6 +701,9 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
if(StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_3)){
record.setBiddingSignDict(EbpProjectCommonUtil.SELECTION_METHOD_MAP.get(purpBaseInfoVO.getProjBaseInfoVO().getComparSelectMode()));
}
if(StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_13)){
record.setBiddingSignDict(EbpProjectCommonUtil.SELECTION_METHOD_MAP.get(purpBaseInfoVO.getProjBaseInfoVO().getComparSelectMode()));
}
String[] isBidMethodList = {ProjectCommonUtil.PROCUREMENT_MODE_1,ProjectCommonUtil.PROCUREMENT_MODE_2};
if(Arrays.asList(isBidMethodList).contains(projectEntrust.getProcurementMode())){
@ -712,10 +717,12 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
record.setExaminationMethodDict(EbpProjectCommonUtil.RECRUITMENT_METHOD_MAP.get(purpBaseInfoVO.getProjBaseInfoVO().getReviewNum()));
}else if(StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_1)
||StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_2)
||StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_3)){
||StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_3)
||StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_13)){
//资审方式 字典
record.setExaminationMethodDict(EbpProjectCommonUtil.EXAMINATION_METHOD_MAP.get(purpBaseInfoVO.getProjBaseInfoVO().getSuppQualify()));
}else if(StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_5)){
}else if(StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_5)
||StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_15)){
//竞谈默认初始化 发公告
record.setExaminationMethodDict(ProjectCommonUtil.PARTAKE_TYPE_2);
}