diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallResuApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallResuApi.java index accaf47..ff6be8c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallResuApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallResuApi.java @@ -19,6 +19,6 @@ public interface MallResuApi { * @param purpId 子项目ID * @return 返回结果 */ - @PostMapping("/v1/resultBaseInfo/findStatusByPurpIdForEval") + @PostMapping("/api/mall-resu/v1/resultBaseInfo/findStatusByPurpIdForEval") BaseResponse findStatusByPurpIdForEval(@RequestParam("purpId") Long purpId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/WfapApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/WfapApi.java index e5434ed..66b865d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/WfapApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/WfapApi.java @@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.project.feign; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.project.feign.entity.Approve; +import com.chinaunicom.mall.ebtp.project.feign.fallback.WfapApiClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -11,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @author daixc * @date 2020/12/21 */ -@FeignClient(value = "${mconfig.service-name-wfap}") +@FeignClient(value = "${mconfig.service-name-wfap}",fallbackFactory = WfapApiClientFallback.class) public interface WfapApi { @@ -20,6 +21,6 @@ public interface WfapApi { * @param approve 实施项目id * @return 返回结果 */ - @PostMapping("/api/mall-wfap/v1/approve/auto/audit/start") + @PostMapping("/api/wfap/v1/approve/auto/audit/start") BaseResponse start(@RequestBody Approve approve); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/WfapApiClientFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/WfapApiClientFallback.java new file mode 100644 index 0000000..507e2d5 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/WfapApiClientFallback.java @@ -0,0 +1,23 @@ +package com.chinaunicom.mall.ebtp.project.feign.fallback; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.project.feign.WfapApi; +import com.chinaunicom.mall.ebtp.project.feign.entity.Approve; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +public class WfapApiClientFallback implements FallbackFactory { + @Override + public WfapApi create(Throwable throwable) { + throwable.printStackTrace(); + return new WfapApi() { + @Override + public BaseResponse start(Approve approve) { + return null; + } + }; + } +} 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 1aea729..6ca8ca2 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 @@ -34,8 +34,11 @@ import com.chinaunicom.mall.ebtp.project.projectrecord.service.IProjectRecordSer import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; @@ -282,6 +285,9 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl baseResponse = mallPurpApi.findDataByPurpImplmentId(Long.parseLong(ebpProjectId)); //调用接口 拼装数据 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 5f849cf..e3f206f 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 @@ -641,8 +641,8 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl getByIdToWfap(@ApiParam(value = "主键ID", required = true) @RequestParam("id") String id) { + + return BaseResponse.success(projectReEvaluationService.getByIdToWfap(id)); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/ProjectReEvaluationMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/ProjectReEvaluationMapper.java index a7cce8a..d31a208 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/ProjectReEvaluationMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/ProjectReEvaluationMapper.java @@ -3,6 +3,8 @@ package com.chinaunicom.mall.ebtp.project.projectreevaluation.dao; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; import com.chinaunicom.mall.ebtp.project.projectreevaluation.entity.ProjectReEvaluation; +import com.chinaunicom.mall.ebtp.project.projectreevaluation.entity.ProjectReEvaluationVO; +import org.apache.ibatis.annotations.Param; /** * 重新评审信息dao层 @@ -11,5 +13,10 @@ import com.chinaunicom.mall.ebtp.project.projectreevaluation.entity.ProjectReEva */ public interface ProjectReEvaluationMapper extends IBaseMapper { - + /** + * 根据ID查询信息 + * @param id 主键id + * @return 返回结果 + */ + ProjectReEvaluationVO getEvaluationVOById(@Param("id") String id); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/mapper/ProjectReEvaluationMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/mapper/ProjectReEvaluationMapper.xml index 5e33730..071dc01 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/mapper/ProjectReEvaluationMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/mapper/ProjectReEvaluationMapper.xml @@ -32,4 +32,29 @@ delete_flag="deleted" where ID=#{id} + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluationVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluationVO.java index 51b82a2..2f793aa 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluationVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluationVO.java @@ -38,4 +38,16 @@ public class ProjectReEvaluationVO extends ProjectReEvaluation implements Serial @ApiModelProperty(value = "排除状态") private Integer isNotStatus; + @ApiModelProperty(value = "项目名称") + private String projectName; + + @ApiModelProperty(value = "项目编号") + private String ebpProjectNumber; + + @ApiModelProperty(value = "标段编号") + private String bidSectBizNum; + + @ApiModelProperty(value = "标段名称") + private String bidSectName; + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java index a81d427..6981e0e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java @@ -90,4 +90,11 @@ public interface IProjectReEvaluationService extends IBaseService getQueryWrapper(ProjectReEvaluationVO vo){ QueryWrapper queryWrapper = new QueryWrapper<>(); if(StringUtils.isNotBlank(vo.getSectionId())){ @@ -241,8 +244,10 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl funcVOList = ebtpMallProcessApi.getManagerList(projectConfig).getData(); + BaseResponse> baseResponse = ebtpMallProcessApi.getManagerList(projectConfig); + + List funcVOList = null; + if(baseResponse.isSuccess()){ + funcVOList = ebtpMallProcessApi.getManagerList(projectConfig).getData(); + }else{ + ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.customValidName(baseResponse.getMessage(),baseResponse.isSuccess()); + } BizAssessRoom assessRoom = new BizAssessRoom(); assessRoom.setSectionId(section.getId()); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 32e8912..a22b9ec 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -100,7 +100,7 @@ eureka: defaultZone: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka instance: prefer-ip-address: true - instance-id: http://10.242.31.158:${server.port} + instance-id: 10.242.31.158:${server.port} # 这是客户端的注册地址, eureka 会通过这个地址建立管道 ip-address: 10.242.31.158 diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 777532d..f8ae2b6 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -145,7 +145,7 @@ mconfig: work-id: 1 #终端ID datacenter-id: 1 #数据中心ID host-name: http://10.242.31.158/ - service-name-purp: mall-purp #采购系统委托项目微服务 + service-name-purp: mall-purp-purp #采购系统委托项目微服务 service-name-wfap: mall-wfap #重新评审 流程微服务 service-name-resu: mall-resu #重新评审 项目中心查询服务 service-price-query : biz-service-price-query #商城询价服务 @@ -153,7 +153,7 @@ mconfig: service-name-auction: biz-service-ebtp-auction-dev #竞拍服务API service-name-calibration: biz-service-ebtp-calibration-dev #标段定标接口 service-name-bid: biz-service-ebtp-bid-dev #标段出始化流程 - service-name-process: biz-service-ebtp-process-dev #标段出始化流程 + service-name-process: biz-service-ebtp-process #标段出始化流程 service-name-resps : biz-service-ebtp-resps-dev #标段应答文件 service-name-rsms : biz-service-ebtp-rsms-dev #评审微服务 service-name-tender : biz-service-ebtp-tender-dev #标段投标微服务