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 8c1affa..c111b91 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 @@ -146,9 +146,15 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert { FRAME_EXCEPTION_PROJECT_SECTION_UPDATE_CHOOSE_PROCESS(110064, "标段流程信息不能为空，请选择流程！"), - FRAME_EXCEPTION_INQUIRY_REVIEW_START_TIME_EMPTY(110065,"询价评审开始时间不能为空不能为空"), + FRAME_EXCEPTION_INQUIRY_REVIEW_START_TIME_EMPTY(110065,"询价评审开始时间不能为空"), - FRAME_EXCEPTION_INQUIRY_END_TIME_EMPTY(110066,"询价评审报价截止时间不能为空不能为空"), + FRAME_EXCEPTION_INQUIRY_END_TIME_EMPTY(110066,"询价评审报价截止时间不能为空"), + + FRAME_EXCEPTION_INQUIRY_NOTICE_STATUS_EMPTY(110067,"询价返回通知状态不能为空"), + + FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_EMPTY(110068,"询价应答格式列表不能为空"), + + FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_CODE_EMPTY(110069,"询价应答格式列表数据中类别编码不能为空"), ; /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java index d3a4458..6a5e22a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java @@ -39,7 +39,7 @@ public interface MallPurpApi { * @return 返回结果 */ @PostMapping("/v1/purpBaseInfo/findDataByPurpImplmentId") - BaseResponse findDataByPurpImplmentId(@RequestParam("purpImplmentId") String purpImplmentId); + BaseResponse findDataByPurpImplmentId(@RequestParam("purpImplmentId") Long purpImplmentId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/PriceQueryApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/PriceQueryApi.java new file mode 100644 index 0000000..94ee867 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/PriceQueryApi.java @@ -0,0 +1,26 @@ +package com.chinaunicom.mall.ebtp.project.feign; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.project.feign.fallback.PriceQueryApiClientFallback; +import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryNoticeVO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 询价流程 访问API + * @author daixc + * @date 2020/12/21 + */ +//@FeignClient(value = "${mconfig.service-price-query}") +@FeignClient(name="biz-service-price-query",url = "http://172.16.15.75.vaiwan.com/",fallbackFactory = PriceQueryApiClientFallback.class) +public interface PriceQueryApi { + + /** + * 招投标推送询价单是否可以发布 + * @param vo 推送实体 + * @return 返回结果 + */ + @PostMapping("/outer/v1.0/inquiryInterface/updateInquiryAllowPublish") + BaseResponse updateInquiryAllowPublish(@RequestBody InquiryNoticeVO vo); +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpProjectClientFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpProjectClientFallback.java index 94a8732..a33c23d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpProjectClientFallback.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpProjectClientFallback.java @@ -34,7 +34,7 @@ public class EbtpProjectClientFallback implements FallbackFactory { } @Override - public BaseResponse findDataByPurpImplmentId(String purpImplmentId) { + public BaseResponse findDataByPurpImplmentId(Long purpImplmentId) { return null; } }; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/PriceQueryApiClientFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/PriceQueryApiClientFallback.java new file mode 100644 index 0000000..5dd6615 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/PriceQueryApiClientFallback.java @@ -0,0 +1,28 @@ +package com.chinaunicom.mall.ebtp.project.feign.fallback; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.project.feign.PriceQueryApi; +import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryNoticeVO; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * 询价接口返回 + * @author daixc + * @date 2021/02/19 + */ +@Slf4j +@Component +public class PriceQueryApiClientFallback implements FallbackFactory { + @Override + public PriceQueryApi create(Throwable throwable) { + throwable.printStackTrace(); + return new PriceQueryApi() { + @Override + public BaseResponse updateInquiryAllowPublish(InquiryNoticeVO vo) { + return null; + } + }; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java index cd36841..099f8ef 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java @@ -320,7 +320,7 @@ public class ProjBaseInfoVO{ private LocalDateTime recruitEndTime; @ApiModelProperty(value = "创建人") - private Long createBy; + private String createBy; @ApiModelProperty(value = "创建时间") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjSuppRelVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjSuppRelVO.java index 32d301f..0c73798 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjSuppRelVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjSuppRelVO.java @@ -5,6 +5,8 @@ package com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -51,8 +53,12 @@ public class ProjSuppRelVO{ private String suppName; @ApiModelProperty(value = "供应商id") + @JsonSerialize(using = ToStringSerializer.class) private Long suppId; + @ApiModelProperty(value = "纳税人类型") + private String taxpayerType; + @ApiModelProperty(value = "终止环节ID") private Long disuseStageId; @@ -74,6 +80,7 @@ public class ProjSuppRelVO{ private String remark; @ApiModelProperty(value = "供应商联系人id") + @JsonSerialize(using = ToStringSerializer.class) private Long suppLinkManId; @ApiModelProperty(value = "供应商联系人姓名") @@ -103,17 +110,39 @@ public class ProjSuppRelVO{ @ApiModelProperty(value = "账户") private String account; + @ApiModelProperty(value = "创建人") + private String createBy; + + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime createDate; + + @ApiModelProperty(value = "更新人") + private String updateBy; + + @ApiModelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateDate; + @ApiModelProperty(value = "租户标识") private String tenantId; @ApiModelProperty(value = "租户名称") private String tenantName; + @ApiModelProperty(value = "逻辑删除") + private String deleteFlag; + @ApiModelProperty(value = "最后更新时间戳") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private LocalDateTime lastUpdateTime; + @ApiModelProperty(value = "乐观锁") + private String versions; + @ApiModelProperty(value = "备用字段1") private String attribute1; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpSuperVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpSuperVO.java index e494cfd..8765391 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpSuperVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpSuperVO.java @@ -84,7 +84,7 @@ public class PurpSuperVO{ private LocalDateTime lastUpdateTime; @ApiModelProperty("创建人") - private Long createBy; + private String createBy; @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -92,7 +92,7 @@ public class PurpSuperVO{ private LocalDateTime createDate; @ApiModelProperty("编辑人") - private Long updateBy; + private String updateBy; @ApiModelProperty("编辑时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") 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 7e1bc78..f3756a8 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 @@ -121,6 +121,7 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl 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()); -// } } /** @@ -357,5 +349,16 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl StringUtils.isEmpty(n.getCode())).count(); + if(isEmptyCodeCount > 0){ + ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_CODE_EMPTY.throwException(); + } + } } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java index 9559402..ceb1e79 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java @@ -18,6 +18,7 @@ import com.chinaunicom.mall.ebtp.project.common.ProjectCommonUtil; import com.chinaunicom.mall.ebtp.project.common.ProjectExceptionEnum; import com.chinaunicom.mall.ebtp.project.feign.EbtpAuctionApi; import com.chinaunicom.mall.ebtp.project.feign.MallPurpApi; +import com.chinaunicom.mall.ebtp.project.feign.PriceQueryApi; import com.chinaunicom.mall.ebtp.project.projectentrust.dao.ProjectEntrustMapper; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrust; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustExpand; @@ -26,7 +27,7 @@ import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.ProjBas import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.PurpBaseInfoVO; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.PurpImplementSendVO; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.PurpSuperVO; -import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryVO; +import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryNoticeVO; import com.chinaunicom.mall.ebtp.project.projectentrust.service.IProjectEntrustExpandService; import com.chinaunicom.mall.ebtp.project.projectentrust.service.IProjectEntrustService; import com.chinaunicom.mall.ebtp.project.projectrecord.service.IProjectRecordService; @@ -65,6 +66,9 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl baseResponse = mallPurpApi.findDataByPurpImplmentId(ebpProjectId); + BaseResponse baseResponse = mallPurpApi.findDataByPurpImplmentId(Long.parseLong(ebpProjectId)); //调用接口 拼装数据 baseOperLogService.addLog(METHOD,JsonUtils.objectToJson(baseResponse),DESCRIPTION,cacheUserService.getCacheUser(),"",true); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java index 4a3e9f4..c8f6e2e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java @@ -157,7 +157,6 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl sectionList) { //查询项目信息