diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java index 0aac817..8c1affa 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java @@ -145,6 +145,10 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert { FRAME_EXCEPTION_PROJECT_ENTRUST_COMPAR_SELECT_MODE_EMPTY(110063, "比选方式不能为空"), FRAME_EXCEPTION_PROJECT_SECTION_UPDATE_CHOOSE_PROCESS(110064, "标段流程信息不能为空，请选择流程！"), + + FRAME_EXCEPTION_INQUIRY_REVIEW_START_TIME_EMPTY(110065,"询价评审开始时间不能为空不能为空"), + + FRAME_EXCEPTION_INQUIRY_END_TIME_EMPTY(110066,"询价评审报价截止时间不能为空不能为空"), ; /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictRegion.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictRegion.java index 90ecc16..546835f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictRegion.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictRegion.java @@ -45,6 +45,10 @@ public class DictRegion implements Serializable { */ @ApiModelProperty(value = "类型：0-省，1-市，2-县") private String level; - + /** + * 缩写 + */ + @ApiModelProperty(value = "缩写") + private String ab; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallProcessApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallProcessApi.java index 6a64fd4..3476964 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallProcessApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallProcessApi.java @@ -69,4 +69,14 @@ public interface EbtpMallProcessApi { @PostMapping("/v1/bizassessroom/updateOpenTime") BaseResponse updateOpenTime(@RequestBody Map sectionMap); + /** + * 询价评审室信息初始化 + * @param tpId 项目Id + * @param sectionMap 标包信息 + * @param openTime 开启评审时间 + * @return 返回结果 + */ + @PostMapping("/v1/bizassessroom/inquiry/initialize") + BaseResponse inquiryInitialize(@RequestParam(name = "tpId") String tpId,@RequestBody Map sectionMap,@RequestParam(name="openTime") String openTime); + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallProcessClientFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallProcessClientFallback.java index 76ba047..1f8de72 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallProcessClientFallback.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallProcessClientFallback.java @@ -59,6 +59,11 @@ public class EbtpMallProcessClientFallback implements FallbackFactory updateOpenTime(Map sectionMap) { return null; } + + @Override + public BaseResponse inquiryInitialize(String tpId, Map sectionMap, String openTime) { + return null; + } }; } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryResponseFormatVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryResponseFormatVO.java index 3d3e36b..18fde69 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryResponseFormatVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryResponseFormatVO.java @@ -38,14 +38,14 @@ public class InquiryResponseFormatVO implements Serializable { private String categoryName; @NotNull(message = "类别编码不能为空") - @ApiModelProperty(value = "类别编码 0-商务、1-技术、2-服务、3-报价、4-其他") + @ApiModelProperty(value = "类别编码 0-商务、1-技术、2-服务、3-报价、4-其他",required = true) private String code; @ApiModelProperty(value = "名称") private String name; @NotNull(message = "格式类型不能为空") - @ApiModelProperty(value = "格式类型 0:rar/zip ; 1: pdf") + @ApiModelProperty(value = "格式类型 0:rar/zip ; 1: pdf",required = true) private Integer type; @ApiModelProperty(value = "创建人名称") 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 b40131f..7e1bc78 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 @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; +import com.chinaunicom.mall.ebtp.common.util.JsonUtils; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.project.common.EbpProjectCommonUtil; import com.chinaunicom.mall.ebtp.project.common.InquiryCommonUtil; @@ -30,6 +31,7 @@ import com.chinaunicom.mall.ebtp.project.projectrecord.service.IProjectRecordSer import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection; import com.chinaunicom.mall.ebtp.project.projectsection.service.IProjectSectionService; import io.seata.spring.annotation.GlobalTransactional; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -44,6 +46,7 @@ import java.util.Map; * @author daixc * @date 2021/01/16 */ +@Slf4j @Service public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl implements IProjectEntrustInquiryService { @@ -174,6 +177,8 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl().eq("entrust_id",projectEntrust.getId())); @@ -197,9 +202,11 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl sectionMaps = projectSectionService.getFlowList(recordVO.getId()); - - projectRecordService.initialize(recordVO.getId(), false, sectionMaps); InquiryVO inquiryVO = projectEntrustVO.getProjectEntrustExpand().getInquiry(); + projectRecordService.initialize(recordVO.getId(), false, sectionMaps); + log.info("初始化询价项目 项目ID："+ recordVO.getId()+ " 流程标识："+ JsonUtils.objectToJson(sectionMaps)+" 询价评审开始时间"+inquiryVO.getReviewStartTime()); + projectRecordService.inquiryInitialize(recordVO.getId(), sectionMaps,inquiryVO.getReviewStartTime()); + //标段ID String sectionId = ""; for(String key : sectionMaps.keySet()){ @@ -228,12 +235,14 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl updateProcessMap = new HashMap<>(16); - updateProcessMap.put(sectionId,inquiryVO.getReviewStartTime()); - response = processApi.updateOpenTime(updateProcessMap); - if(!response.isSuccess()){ - ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_NOT_FIND.customValidName(response.getMessage(),!response.isSuccess()); - } +// Map updateProcessMap = new HashMap<>(16); +// updateProcessMap.put(sectionId,inquiryVO.getReviewStartTime()); +// +// response = processApi.updateOpenTime(updateProcessMap); +// if(!response.isSuccess()){ +// log.info("初始化询价项目 评审时间返回结果："+ JsonUtils.objectToJson(response)); +// ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_NOT_FIND.customValidName(response.getMessage(),!response.isSuccess()); +// } } /** @@ -314,6 +323,11 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl{ * @return 返回结果 */ boolean isInvitation(ProjectRecord projectRecord); + + /** + * 询价初始化标段评审流程 + * @param id 项目ID + * @param sectionMaps 流程ID集合 + * @param reviewStartTime 评审开始时间 + */ + void inquiryInitialize(String id, Map sectionMaps, LocalDateTime reviewStartTime); } 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 eca3fe2..f845614 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 @@ -53,6 +53,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; /** @@ -403,6 +405,13 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl sectionMaps, LocalDateTime 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)); + } + @Override public boolean assent(String entrustId) {