修改委托字段属性信息

2021-02-20 14:57:03 +08:00
parent 1cb7d66d33
commit 0db42bfaef
11 changed files with 127 additions and 27 deletions
--- 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,"询价应答格式列表数据中类别编码不能为空"),
    ;

    /**
--- 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<PurpImplementSendVO> findDataByPurpImplmentId(@RequestParam("purpImplmentId") String purpImplmentId);
+    BaseResponse<PurpImplementSendVO> findDataByPurpImplmentId(@RequestParam("purpImplmentId") Long purpImplmentId);


 }
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/PriceQueryApi.java
+++ 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);
+}
--- 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<MallPurpApi> {
            }

            @Override
-            public BaseResponse<PurpImplementSendVO> findDataByPurpImplmentId(String purpImplmentId) {
+            public BaseResponse<PurpImplementSendVO> findDataByPurpImplmentId(Long purpImplmentId) {
                return null;
            }
        };
--- 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
@ -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<PriceQueryApi> {
+    @Override
+    public PriceQueryApi create(Throwable throwable) {
+        throwable.printStackTrace();
+        return new PriceQueryApi() {
+            @Override
+            public BaseResponse updateInquiryAllowPublish(InquiryNoticeVO vo) {
+                return null;
+            }
+        };
+    }
+}
--- 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")
--- 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;

--- 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")
--- 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<ProjectEnt
    @Override
    public boolean inquiryNotice(InquiryNoticeVO inquiryNoticeVO) {
        boolean result = false;
+        ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_NOTICE_STATUS_EMPTY.customValid(null == inquiryNoticeVO.getInquiryNoticeStatus());
        switch (inquiryNoticeVO.getInquiryNoticeStatus()){
            case ProjectCommonUtil.INQUIRY_NOTICE_STATUS_0:result = initInquiryProject(inquiryNoticeVO);break;
            case ProjectCommonUtil.INQUIRY_NOTICE_STATUS_1:result = exceptionService.saveInquiryException(inquiryNoticeVO);break;
@ -234,15 +235,6 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl<ProjectEnt
        if(!response.isSuccess()){
            ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_NOT_FIND.customValidName(response.getMessage(),!response.isSuccess());
        }
-        //修改评审室开始时间
-//        Map<String, LocalDateTime> 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<ProjectEnt
        if(!isExistInquiryFile){
            ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_ATTACHMENT_LIST_EMPTY.throwException();
        }
+
+        //询价应答格式不能为空
+        if(null == inquiryVO.getResponseFormatList() || inquiryVO.getResponseFormatList().size() <= 0){
+            ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_EMPTY.throwException();
+        }else{
+            //询价应答格式code不能为空
+            long isEmptyCodeCount = inquiryVO.getResponseFormatList().stream().filter(n -> StringUtils.isEmpty(n.getCode())).count();
+            if(isEmptyCodeCount > 0){
+                ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_CODE_EMPTY.throwException();
+            }
+        }
    }
 }
--- 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<ProjectEntrustMap
    @Resource
    private MallPurpApi mallPurpApi;

+    @Resource
+    private PriceQueryApi priceQueryApi;
+
    private static final String METHOD  = "initProjectEntrust";

    private static final String DESCRIPTION  = "项目委托查询采购数据";
@ -156,6 +160,7 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
    }

    @Override
+    @Transactional(rollbackFor = Exception.class)
    public boolean agencyCompanyDispatch(String id,String remarks) {
        ProjectEntrust projectEntrust = this.getById(id);
        projectEntrust.setId(id);
@ -164,12 +169,14 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
        boolean result = updateStatus(projectEntrust,ProjectCommonUtil.ENTRUS_STATUS_9);
        CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValid(!result);

+        //通知商城询价项目不接受
        if(StringUtils.equals(ProjectCommonUtil.PROCUREMENT_MODE_7,projectEntrust.getProcurementMode())){
-            InquiryVO inquiryVO = new InquiryVO();
+            InquiryNoticeVO inquiryVO = new InquiryNoticeVO();
            inquiryVO.setInquiryId(projectEntrust.getProcurementPlanId());
-            inquiryVO.setApIsAllowPublish(ProjectCommonUtil.IS_ALLOW_PUBLISH_0);
-            inquiryVO.setApRefuseReason(remarks);
-            //todo 发送询价信息通知接口
+            inquiryVO.setInquiryNoticeStatus(ProjectCommonUtil.INQUIRY_NOTICE_STATUS_1);
+            inquiryVO.setReason(remarks);
+            BaseResponse response = priceQueryApi.updateInquiryAllowPublish(inquiryVO);
+            CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(response.getMessage(),!response.isSuccess());
        }

        return result;
@ -188,12 +195,13 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap

            CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValid(!result);

-            //如果询价进行通知 其余出始化项目
+            //如果询价进行通知 其余出始化项目  项目经理同意 发送可以发布
            if(StringUtils.equals(ProjectCommonUtil.PROCUREMENT_MODE_7,projectEntrust.getProcurementMode())){
-                InquiryVO inquiryVO = new InquiryVO();
+                InquiryNoticeVO inquiryVO = new InquiryNoticeVO();
                inquiryVO.setInquiryId(projectEntrust.getProcurementPlanId());
-                inquiryVO.setApIsAllowPublish(ProjectCommonUtil.IS_ALLOW_PUBLISH_1);
-                //todo 发送询价信息通知接口
+                inquiryVO.setInquiryNoticeStatus(ProjectCommonUtil.INQUIRY_NOTICE_STATUS_0);
+                BaseResponse response = priceQueryApi.updateInquiryAllowPublish(inquiryVO);
+                CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(response.getMessage(),!response.isSuccess());
            }else{
                //初始化项目信息
                result = projectRecordService.assent(id);
@ -274,7 +282,7 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap

        if(isRequestClient){

-            BaseResponse<PurpImplementSendVO> baseResponse = mallPurpApi.findDataByPurpImplmentId(ebpProjectId);
+            BaseResponse<PurpImplementSendVO> baseResponse = mallPurpApi.findDataByPurpImplmentId(Long.parseLong(ebpProjectId));

            //调用接口  拼装数据
            baseOperLogService.addLog(METHOD,JsonUtils.objectToJson(baseResponse),DESCRIPTION,cacheUserService.getCacheUser(),"",true);
--- 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<ProjectExceptio

    @Override
    @Transactional(rollbackFor = Exception.class)
-    @GlobalTransactional
    public boolean updateState(String id) {
        ProjectException projectException = this.getById(id);

@ -269,6 +268,7 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
     * @param projectException 项目ID
     * @param sectionList 项目标段
     */
+    @GlobalTransactional
    private void launchAgainProject(ProjectException projectException,List<ProjectSection> sectionList) {

        //查询项目信息