diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ISeatatEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ISeatatEntrustServiceImpl.java index 4118576..bf71737 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ISeatatEntrustServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ISeatatEntrustServiceImpl.java @@ -15,6 +15,7 @@ import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustVO; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryNoticeVO; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryVO; import com.chinaunicom.mall.ebtp.project.projectentrust.service.ISeataEntrustService; +import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord; import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO; import com.chinaunicom.mall.ebtp.project.projectrecord.service.IProjectRecordService; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection; @@ -62,14 +63,11 @@ public class ISeatatEntrustServiceImpl extends BaseServiceImpl sectionMaps = projectSectionService.getFlowList(recordVO.getId()); InquiryVO inquiryVO = projectEntrustVO.getProjectEntrustExpand().getInquiry(); - projectRecordService.initialize(recordVO.getId(), false, sectionMaps); - log.info("初始化询价项目 项目ID:"+ recordVO.getId()+ " 流程标识:"+ JsonUtils.objectToJson(sectionMaps)+" 询价评审开始时间"+inquiryVO.getReviewStartTime()); + RootContext.bind(xid); projectRecordService.inquiryInitialize(recordVO.getId(), sectionMaps,inquiryVO.getReviewStartTime()); //标段ID @@ -78,7 +76,6 @@ public class ISeatatEntrustServiceImpl extends BaseServiceImpl + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java index 3a318e0..96bdf89 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java @@ -344,4 +344,7 @@ public class ProjectRecord extends BaseEntity implements Serializable { @ApiModelProperty(value = "询价方式(公开询价 定向询价)") private String invitationMethod; + @ApiModelProperty(value = "公开招标 招标形式(依法招标 自愿招标)") + private String openTenderForm; + } 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 754cb73..d54cf3f 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 @@ -414,6 +414,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl sectionMaps, LocalDateTime reviewStartTime) { + log.info("初始化询价项目 项目ID:"+ id+ " 流程标识:"+ JsonUtils.objectToJson(sectionMaps)+" 询价评审开始时间"+DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(reviewStartTime)); BaseResponse result = ebtpMallProcessApi.inquiryInitialize(id,sectionMaps,DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(reviewStartTime)); ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_INIT_ERROR.customValid(!result.isSuccess()); log.info("询价初始化流程返回 projectID:"+id + " 返回结果:"+JsonUtils.objectToJson(result));