From 929a879676cbcab1fd14eac9cdf6e6daa806a695 Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 2 Mar 2021 15:14:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AF=84=E5=AE=A1=E5=92=8C?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/common/ProjectCommonUtil.java | 2 +- .../ebtp/project/feign/entity/Approve.java | 25 ++++++++++++++----- .../entity/StandardNextParticipantVO.java | 20 +++++++++++++++ .../impl/ProjectExceptionServiceImpl.java | 6 ++--- .../column/ProjectReEvaluationField.java | 2 +- .../impl/ProjectReEvaluationServiceImpl.java | 18 ++++++++++--- .../impl/ProjectSectionServiceImpl.java | 2 +- 7 files changed, 59 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/StandardNextParticipantVO.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java index b9498a9..336e828 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java +++ b/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 是 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/Approve.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/Approve.java index 7c55986..f0f6372 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/Approve.java +++ b/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 standardNextParticipants; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/StandardNextParticipantVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/StandardNextParticipantVO.java new file mode 100644 index 0000000..03ae6d9 --- /dev/null +++ b/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; +} diff --git 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 index 45037ab..6583c8a 100644 --- 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 @@ -384,10 +384,10 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl 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 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 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(); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java index 826a765..661ca6c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java @@ -205,7 +205,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl 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);