1、重新评审流程追踪地址获取

2、增加标段金额累计

src/main/java/com/chinaunicom/mall/ebtp/project/feign/WfapApi.java

@@ -3,6 +3,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.entity.ProjectReEvaluationTaskVO;
+import com.chinaunicom.mall.ebtp.project.feign.entity.TraceDetail;
 import com.chinaunicom.mall.ebtp.project.feign.fallback.WfapApiClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,4 +25,12 @@ public interface WfapApi {
      */
     @PostMapping("/api/wfap/v1/approve/auto/audit/start")
     BaseResponse<ProjectReEvaluationTaskVO> start(@RequestBody Approve approve);
+
+    /**
+     * @param traceDetail 查询流程跟踪
+     * @return 返回结果
+     */
+    @PostMapping("/api/wfap/v1/approve/find/trace/detail")
+    BaseResponse<TraceDetail> findTraceDetail(TraceDetail traceDetail);
+
 }

src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/TraceDetail.java

@@ -0,0 +1,25 @@
+package com.chinaunicom.mall.ebtp.project.feign.entity;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 实体类 TraceDetail
+ *
+ * @author daixc
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel
+public class TraceDetail {
+
+    @ApiModelProperty(value = "流程实例id")
+    private String processInstId;
+
+    @ApiModelProperty(value = "访问url")
+    private String traceDetailUrl;
+
+}

src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/WfapApiClientFallback.java

@@ -3,6 +3,7 @@ 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 com.chinaunicom.mall.ebtp.project.feign.entity.TraceDetail;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -18,6 +19,11 @@ public class WfapApiClientFallback implements FallbackFactory<WfapApi> {
             public BaseResponse start(Approve approve) {
                 return null;
             }
+
+            @Override
+            public BaseResponse<TraceDetail> findTraceDetail(TraceDetail traceDetail) {
+                return null;
+            }
         };
     }
 }

src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -197,11 +198,23 @@ public class ProjectRecordController{
 	 */
 	@ApiOperation("根据询价单id查询数据")
 	@GetMapping("/getByInquiryId/{inquiryId}")
-	public BaseResponse<ProjectRecordVO> getByInquiryId(@ApiParam(value = "主键id", required = true) @PathVariable String inquiryId){
+	public BaseResponse<ProjectRecordVO> getByInquiryId(@ApiParam(value = "询价单id", required = true) @PathVariable String inquiryId){
 
 		ProjectRecord projectRecord = projectRecordService.getByInquiryId(inquiryId);
 
 		return BaseResponse.success(BeanUtil.toBean(projectRecord,ProjectRecordVO.class));
 	}
 
+	/**
+	 * 根据id查询标段所有的预算金额合计
+	 * @param id 主键id
+	 * @return 返回结果
+	 */
+	@ApiOperation("根据id查询标段所有的预算金额合计")
+	@GetMapping("/getBudgetAmountById/{id}")
+	public BaseResponse<BigDecimal> getBudgetAmountById(@ApiParam(value = "主键id", required = true) @PathVariable String id){
+
+		return  BaseResponse.success(projectRecordService.getBudgetAmountById(id));
+	}
+
 }

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

@@ -7,6 +7,7 @@ import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustVO;
 import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord;
 import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
@@ -136,4 +137,11 @@ public interface IProjectRecordService extends IBaseService<ProjectRecord>{
     void inquiryInitialize(String id, Map<String, String> sectionMaps, LocalDateTime reviewStartTime);
 
     ProjectRecord getByInquiryId(String inquiryId);
+
+    /**
+     * 获取
+     * @param id
+     * @return
+     */
+    BigDecimal getBudgetAmountById(String id);
 }

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

@@ -36,6 +36,7 @@ import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord;
 import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO;
 import com.chinaunicom.mall.ebtp.project.projectrecord.service.IProjectRecordService;
 import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection;
+import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionVO;
 import com.chinaunicom.mall.ebtp.project.projectsection.service.IProjectSectionFlowService;
 import com.chinaunicom.mall.ebtp.project.projectsection.service.IProjectSectionService;
 import com.chinaunicom.mall.ebtp.project.projectupdatefield.entity.ProjectUpdateField;
@@ -48,6 +49,7 @@ import com.chinaunicom.mall.ebtp.project.sectionsupplier.entity.SectionSupplierV
 import com.chinaunicom.mall.ebtp.project.sectionsupplier.service.ISectionSupplierService;
 import io.seata.core.context.RootContext;
 import io.seata.spring.annotation.GlobalTransactional;
+import io.seata.tm.api.transaction.SuspendedResourcesHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.security.core.parameters.P;
@@ -55,6 +57,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -428,6 +431,22 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
         return this.getOne(this.getProjectRecordQueryWrapper(vo));
     }
 
+    @Override
+    public BigDecimal getBudgetAmountById(String id) {
+
+        ProjectSectionVO section = new ProjectSectionVO();
+        section.setProjectId(id);
+        List<ProjectSection> sectionList = projectSectionService.getList(section);
+        BigDecimal budgetAmount = new BigDecimal(0);
+        for (ProjectSection projectSection : sectionList) {
+            if (null != projectSection.getBidSectContractPrice()) {
+                budgetAmount = budgetAmount.add(projectSection.getBidSectContractPrice());
+            }
+        }
+
+        return budgetAmount.setScale(4,BigDecimal.ROUND_HALF_UP);
+    }
+
     @Override
     public boolean assent(String entrustId) {
 

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

@@ -4,6 +4,7 @@ package com.chinaunicom.mall.ebtp.project.projectreevaluation.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.mall.ebtp.project.baseoperlog.aop.OperLog;
+import com.chinaunicom.mall.ebtp.project.feign.entity.TraceDetail;
 import com.chinaunicom.mall.ebtp.project.feign.entity.WasUpdateBizDTO;
 import com.chinaunicom.mall.ebtp.project.projectreevaluation.entity.ProjectReEvaluationVO;
 import org.springframework.validation.annotation.Validated;
@@ -197,4 +198,16 @@ public class ProjectReEvaluationController {
 
         return BaseResponse.success(projectReEvaluationService.getByIdToWfap(id));
     }
+
+    /**
+     * 查询流程跟踪
+     * @param instanceId 主键ID
+     * @return 返回结果
+     */
+    @ApiOperation("查询流程跟踪")
+    @PostMapping("/findTraceDetail")
+    public BaseResponse<TraceDetail> findTraceDetail(@ApiParam(value = "流程实例id", required = true) @RequestParam("instanceId") String instanceId) {
+
+        return BaseResponse.success(projectReEvaluationService.findTraceDetail(instanceId));
+    }
 }

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

@@ -4,6 +4,7 @@ package com.chinaunicom.mall.ebtp.project.projectreevaluation.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.service.IBaseService;
 import com.chinaunicom.mall.ebtp.project.feign.entity.BizAgainSection;
+import com.chinaunicom.mall.ebtp.project.feign.entity.TraceDetail;
 import com.chinaunicom.mall.ebtp.project.feign.entity.WasUpdateBizDTO;
 import com.chinaunicom.mall.ebtp.project.projectreevaluation.entity.ProjectReEvaluation;
 import com.chinaunicom.mall.ebtp.project.projectreevaluation.entity.ProjectReEvaluationVO;
@@ -97,4 +98,11 @@ public interface IProjectReEvaluationService extends IBaseService<ProjectReEvalu
      * @return 返回结果
      */
     ProjectReEvaluationVO getByIdToWfap(String id);
+
+    /**
+     * 查询流程跟踪
+     * @param instanceId 主键ID
+     * @return 返回结果
+     */
+    TraceDetail findTraceDetail(String instanceId);
 }

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

@@ -355,6 +355,15 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
         return reEvaluationMapper.getEvaluationVOById(id);
     }
 
+    @Override
+    public TraceDetail findTraceDetail(String instanceId) {
+        TraceDetail traceDetail = new TraceDetail();
+        traceDetail.setProcessInstId(instanceId);
+        BaseResponse<TraceDetail> response = wfapApi.findTraceDetail(traceDetail);
+        ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(response.getMessage(),!response.isSuccess());
+        return response.getData();
+    }
+
 
     /**
      * 初始化标段信息