1、修改询价初始化评审开始时间没存入问题

2、项目增加招标形式字段

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<ProjectEntrustMap
         log.info("询价初始化发起事务 xid:" + xid);
 
         //初始化流程
-        ProjectRecordVO recordVO = new ProjectRecordVO();
+        ProjectRecord recordVO = projectRecordService.getByInquiryId(projectEntrustVO.getProcurementPlanId());
-        recordVO.setEbpProjectId(projectEntrustVO.getProcurementPlanId());
-        recordVO = projectRecordService.getList(recordVO).get(0);
 
         Map<String,String> sectionMaps = projectSectionService.getFlowList(recordVO.getId());
         InquiryVO inquiryVO = projectEntrustVO.getProjectEntrustExpand().getInquiry();
-        projectRecordService.initialize(recordVO.getId(), false, sectionMaps);
+        RootContext.bind(xid);
-        log.info("初始化询价项目 项目ID："+ recordVO.getId()+ " 流程标识："+ JsonUtils.objectToJson(sectionMaps)+" 询价评审开始时间"+inquiryVO.getReviewStartTime());
         projectRecordService.inquiryInitialize(recordVO.getId(), sectionMaps,inquiryVO.getReviewStartTime());
 
         //标段ID
@@ -78,7 +76,6 @@ public class ISeatatEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
             sectionId = key;
         }
 
-        RootContext.bind(xid);
         //初始化招标文件
         DocumentXjVO xjVO = new DocumentXjVO();
         xjVO.setTpId(recordVO.getId());
@@ -97,7 +94,9 @@ public class ISeatatEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
         tdocVO.setCreateDate(recordVO.getCreateDate());
         tdocVO.setSectionName(recordVO.getProjectName()+ "包件");
         tdocVO.setEndDate(inquiryVO.getEndTime());
+        log.info("询价项目初始化应答文件入参："+tdocVO);
         response = ebtpRespsApi.initInquiryResponseFormat(tdocVO);
+        log.info("询价项目初始化应答文件返回结果："+tdocVO);
         if(!response.isSuccess()){
             ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_NOT_FIND.customValidName(response.getMessage(),!response.isSuccess());
         }

src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/mapper/ProjectRecordMapper.xml

@@ -56,6 +56,7 @@
             <result column="recruit_end_time"  jdbcType="TIMESTAMP"  property="recruitEndTime"/>
             <result column="is_approval"  jdbcType="VARCHAR" property="isApproval"/>
             <result column="invitation_method"  jdbcType="VARCHAR" property="invitationMethod"/>
+            <result column="open_tender_form"  jdbcType="VARCHAR" property="openTenderForm"/>
             <result column="create_by"  jdbcType="VARCHAR" property="createBy"/>
             <result column="create_date"  jdbcType="TIMESTAMP"  property="createDate"/>
             <result column="update_by"  jdbcType="VARCHAR" property="updateBy"/>

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;
+
 }

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

@@ -414,6 +414,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
 
     @Override
     public void inquiryInitialize(String id, Map<String, String> sectionMaps, LocalDateTime reviewStartTime) {
+        log.info("初始化询价项目 项目ID："+ id+ " 流程标识："+ JsonUtils.objectToJson(sectionMaps)+" 询价评审开始时间"+DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(reviewStartTime));
         BaseResponse<Boolean> 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));