增加重新评审查询接口以及相关路径修改

修改委托之后标段编号

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<Boolean> findStatusByPurpIdForEval(@RequestParam("purpId") Long purpId);
 }

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

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<WfapApi> {
+    @Override
+    public WfapApi create(Throwable throwable) {
+        throwable.printStackTrace();
+        return new WfapApi() {
+            @Override
+            public BaseResponse start(Approve approve) {
+                return null;
+            }
+        };
+    }
+}

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<ProjectEntrustMap
 
         if(isRequestClient){
 
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String authorization = request.getHeader("Authorization");
+            log.debug("委托请求头 authorization："+ authorization);
             BaseResponse<PurpImplementSendVO> baseResponse = mallPurpApi.findDataByPurpImplmentId(Long.parseLong(ebpProjectId));
 
             //调用接口  拼装数据

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

@@ -641,8 +641,8 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
                 section.setBusinessModule(ProjectCommonUtil.BUSINESS_MODULE_1);
             }
 
-            //标段流水号
+            //标段流水号  采购建项编号
-            section.setBidSectBizNum(expand.getPurpImplementSendVO().getPurpImplementNo()+"/"+section.getBidSectCode());
+            section.setBidSectBizNum(projBaseInfoVO.getPurpNo());
             //方案ID
             section.setProjectPlanId(String.valueOf(projBaseInfoVO.getId()));
             //子项目ID

src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java

@@ -183,4 +183,16 @@ public class ProjectReEvaluationController {
 
         return BaseResponse.success(projectReEvaluationService.getById(ids,wfSectionNo));
     }
+
+    /**
+     * 查看审批流程前端展示
+     * @param id 主键ID
+     * @return 返回结果
+     */
+    @ApiOperation("查看审批流程前端展示")
+    @PostMapping("/getByIdToWfap")
+    public BaseResponse<ProjectReEvaluationVO> getByIdToWfap(@ApiParam(value = "主键ID", required = true) @RequestParam("id") String id) {
+
+        return BaseResponse.success(projectReEvaluationService.getByIdToWfap(id));
+    }
 }

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<ProjectReEvaluation> {
 
-	
+    /**
+     * 根据ID查询信息
+     * @param id 主键id
+     * @return 返回结果
+     */
+    ProjectReEvaluationVO getEvaluationVOById(@Param("id") String id);
 }

src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/mapper/ProjectReEvaluationMapper.xml

@@ -32,4 +32,29 @@
         delete_flag="deleted"
         where ID=#{id}
 	</update>
+
+    <select id="getEvaluationVOById" resultType="com.chinaunicom.mall.ebtp.project.projectreevaluation.entity.ProjectReEvaluationVO">
+        SELECT
+            t.id as id,
+            t.project_id as projectId,
+            t.section_id as sectionId,
+            t.reason as reason,
+            t.evaluation_start_time as evaluationStartTime,
+            t.evaluation_end_time as evaluationEndTime,
+            t.evaluation_place as evaluationPlace,
+            t.is_agreement as isAgreement,
+            t.upload_file_id as uploadFileId,
+            p.project_name as projectName,
+            p.ebp_project_number as ebpProjectNumber,
+            s.bid_sect_biz_num as bidSectBizNum,
+            s.bid_sect_name as bidSectName
+        FROM
+            biz_project_re_evaluation t,
+            biz_project_section s,
+            biz_project_record p
+        WHERE
+            t.project_id = p.id
+          AND t.section_id = s.id
+          AND t.id = #{id}
+    </select>
 </mapper>

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

src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java

@@ -90,4 +90,11 @@ public interface IProjectReEvaluationService extends IBaseService<ProjectReEvalu
      * @return
      */
     ProjectReEvaluationVO getById(String ids, String wfSectionNo);
+
+    /**
+     * 查看审批流程前端展示
+     * @param id 主键ID
+     * @return 返回结果
+     */
+    ProjectReEvaluationVO getByIdToWfap(String id);
 }

src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java

@@ -99,6 +99,9 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
     @Resource
     private MallResuApi mallResuApi;
 
+    @Resource
+    private ProjectReEvaluationMapper reEvaluationMapper;
+
     private QueryWrapper<ProjectReEvaluation> getQueryWrapper(ProjectReEvaluationVO vo){
         QueryWrapper<ProjectReEvaluation> queryWrapper = new QueryWrapper<>();
         if(StringUtils.isNotBlank(vo.getSectionId())){
@@ -241,8 +244,10 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
         approve.setBusinessType(record.getBidMethodSubDict());
         approve.setSubBusinessType(EbpProjectCommonUtil.SUB_BUSINESS_TYPE);
         approve.setStartUserType(ProjectCommonUtil.START_USER_TYPE_PARTNER);
-
+        log.info("访问重新评审流程初始化接口参数："+ JsonUtils.objectToJson(approve));
-        if(!wfapApi.start(approve).isSuccess()){
+        BaseResponse response =  wfapApi.start(approve);
+        log.info("访问重新评审流程初始化接口返回结果："+ JsonUtils.objectToJson(response));
+        if(!response.isSuccess()){
             CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.throwException();
         }
     }
@@ -317,7 +322,12 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
 
     @Override
     public ProjectReEvaluationVO getById(String ids, String wfSectionNo) {
-        return BeanUtil.toBean(this.getById(ids),ProjectReEvaluationVO.class);
+        return reEvaluationMapper.getEvaluationVOById(ids);
+    }
+
+    @Override
+    public ProjectReEvaluationVO getByIdToWfap(String id) {
+        return reEvaluationMapper.getEvaluationVOById(id);
     }
 
 

src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
+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.exception.common.CommonExceptionEnum;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
@@ -420,7 +421,14 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
         projectConfig.setMethodCode(projectRecord.getExaminationMethodDict());
         projectConfig.setSignCode(projectRecord.getBiddingSignDict());
 
-        List<WfProjectConfigTask> funcVOList = ebtpMallProcessApi.getManagerList(projectConfig).getData();
+        BaseResponse<List<WfProjectConfigTask>> baseResponse = ebtpMallProcessApi.getManagerList(projectConfig);
+
+        List<WfProjectConfigTask> 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());

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
 

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  #标段投标微服务