重新评审和异常处理接口对接

src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java

@@ -426,7 +426,7 @@ public class ProjectCommonUtil {
     /**
      * internal:用户中心人员; partner:合作方人员
      */
-    public static final String START_USER_TYPE_PARTNER = "internal";
+    public static final String START_USER_TYPE_PARTNER = "partner";
 
     /**
      * 是否使用客户端工具加解密 0 是

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 调用外部流程信息
@@ -50,12 +51,6 @@ public class Approve implements Serializable {
     @ApiModelProperty(value = "租户id")
     private String tenantId;
 
-    @ApiModelProperty(value = "orgOu")
-    private String orgOu;
-
-    @ApiModelProperty(value = "cumail")
-    private String cumail;
-
     @ApiModelProperty(value = "业务类型(001:寻源; 002:招募; 003:处置;)")
     private String businessType;
 
@@ -70,4 +65,22 @@ public class Approve implements Serializable {
 
     @ApiModelProperty(value = "发起人类型 是否联通内部用户 partner 不是")
     private String startUserType;
+
+    @ApiModelProperty(value = "采购承办人")
+    private String startUserDN;
+
+    @ApiModelProperty(value = "单据的单位")
+    private String billOffice;
+
+    @ApiModelProperty(value = "关联单据")
+    private String associatedBillOffice;
+
+    @ApiModelProperty(value = "关联单据编制人")
+    private String associatedBillPreparePerson;
+
+    @ApiModelProperty(value = "合作方用户提交审批下一步环节定义id, 不传递默认a002")
+    private String selectSteps;
+
+    @ApiModelProperty(value = "合作方用户提交审批下一步送审人员信息")
+    private List<StandardNextParticipantVO> standardNextParticipants;
 }

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

@@ -0,0 +1,20 @@
+package com.chinaunicom.mall.ebtp.project.feign.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class StandardNextParticipantVO {
+
+    /**
+     * 人员staffId码
+     */
+    @ApiModelProperty(value = "人员staffId码")
+    private String cuMail;
+
+    /**
+     * 部门ou组织码
+     */
+    @ApiModelProperty(value = "部门ou组织码")
+    private String deptOu;
+}

src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java

@@ -384,10 +384,10 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
         failRequest.setFailStatus(EbpProjectCommonUtil.FAIL_STATUS_MAP.get(projectException.getExceptionDesc()));
         failRequest.setFailCause(dictProject.getDicName());
         //调用接口
-        boolean isSuccess = mallPurpApi.projInvitationFail(failRequest).isSuccess();
+        BaseResponse baseResponse = mallPurpApi.projInvitationFail(failRequest);
 
-        if(!isSuccess){
+        if(!baseResponse.isSuccess()){
-            ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_INVITATION_FAIL_ERROR.throwException();
+            ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_INVITATION_FAIL_ERROR.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess());
         }
     }
 

src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/column/ProjectReEvaluationField.java

@@ -81,6 +81,6 @@ public class ProjectReEvaluationField {
     /**
      * 流程ID
      */
-    public static final String INSTANCE_ID = "instanceId";
+    public static final String INSTANCE_ID = "instance_id";
 
 }

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

@@ -181,6 +181,9 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
     @Transactional(rollbackFor = Exception.class)
     public boolean submitForApproval(String id) {
 
+//        initSection(id);
+//        boolean result = updateStatus(id,ProjectCommonUtil.RE_EVALUATION_STATUS_0,ProjectCommonUtil.RE_EVALUATION_STATUS_2);
+
         //1 去采购系统校验子项目信息是否发生改变  如果发生改变不可以重新评审
         ProjectReEvaluation evaluation = this.getById(id);
         ProjectSection section = sectionService.getById(evaluation.getSectionId());
@@ -244,21 +247,28 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
 
         BaseResponse<LoginUserDetailVO> baseResponse = usercenterApi.getLoninUserDetail(record.getOwnerContactId());
         if(!baseResponse.isSuccess()){
-
+            CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess());
         }
         LoginUserDetailVO loginUserDetailVO = baseResponse.getData();
-        approve.setOrgOu(loginUserDetailVO.getOu());
-        approve.setCumail(record.getOwnerContactId());
         approve.setWfSectionNo(wfSectionNo);
         approve.setWfSectionName(wfSectionName);
         approve.setBusinessType(record.getBidMethodSubDict());
         approve.setSubBusinessType(EbpProjectCommonUtil.SUB_BUSINESS_TYPE);
         approve.setStartUserType(ProjectCommonUtil.START_USER_TYPE_PARTNER);
+
+        List<StandardNextParticipantVO> standardNextParticipants = new ArrayList<>();
+        StandardNextParticipantVO participantVO = new StandardNextParticipantVO();
+        participantVO.setCuMail(loginUserDetailVO.getStaffId());
+        participantVO.setDeptOu(loginUserDetailVO.getOu());
+        standardNextParticipants.add(participantVO);
+
+        approve.setStandardNextParticipants(standardNextParticipants);
+
         log.info("访问重新评审流程初始化接口参数："+ JsonUtils.objectToJson(approve));
         BaseResponse<ProjectReEvaluationTaskVO> response =  wfapApi.start(approve);
         log.info("访问重新评审流程初始化接口返回结果："+ JsonUtils.objectToJson(response));
         if(!response.isSuccess()){
-            CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.throwException();
+            CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(response.getMessage(),!response.isSuccess());
         }
         return response.getData();
     }

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

@@ -205,7 +205,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
 
         UpdateWrapper<ProjectSection> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id",sectionId);
-        updateWrapper.eq("business_module", ProjectCommonUtil.BUSINESS_MODULE_4);
+        updateWrapper.and(wrapper ->wrapper.eq("business_module", ProjectCommonUtil.BUSINESS_MODULE_3).or().eq("business_module", ProjectCommonUtil.BUSINESS_MODULE_4));
         updateWrapper.set("business_module",ProjectCommonUtil.BUSINESS_MODULE_5);
 
         boolean result = this.update(updateWrapper);