wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-3581: 合同不能拒签

Browse Source
This commit is contained in:
yanglin 2025-02-26 16:16:37 +08:00
parent bfcd95d00a
commit 8b27a9d851
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/Approver.java
View File

@ -11,8 +11,6 @@ import lombok.Setter;
import org.hibernate.validator.constraints.Range; import org.hibernate.validator.constraints.Range;
import javax.validation.Valid; import javax.validation.Valid;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
@ -29,6 +27,11 @@ public class Approver implements OrgPerson {
@Valid @Valid
private OrgPersonInfo signPerson; private OrgPersonInfo signPerson;
/**
* 签署选项
*/
private SignOption signOption = new SignOption();
/** /**
* 在指定签署方时，可选择企业B端或个人C端等不同的参与者类型 * 在指定签署方时，可选择企业B端或个人C端等不同的参与者类型
*/ */

22
ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/SignOption.java Normal file
View File

@ -0,0 +1,22 @@
package cn.axzo.nanopart.ess.api.domain.contract;
import lombok.Getter;
import lombok.Setter;
/**
* @author yanglin
*/
@Setter @Getter
public class SignOption {
/**
* 是否可以拒签. false-可以拒签, true-不可以拒签
*/
private boolean noRefuse = true;
/**
* 是否可以转发. false-可以转发 true-不可以转发
*/
private boolean noTransfer = true;
}

8
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java
View File

@ -224,10 +224,9 @@ public class EssClient implements InitializingBean {
for (Approver approver : contract.getApprovers()) { for (Approver approver : contract.getApprovers()) {
FlowApproverInfo approverInfo = new FlowApproverInfo(); FlowApproverInfo approverInfo = new FlowApproverInfo();
approvers.add(approverInfo); approvers.add(approverInfo);
if (approver.getSignPerson() == null) {
ApproverOption approverOption = new ApproverOption(); ApproverOption approverOption = new ApproverOption();
if (approver.getSignPerson() == null) {
approverOption.setFillType(1L); approverOption.setFillType(1L);
approverInfo.setApproverOption(approverOption);
} else { } else {
OrganizationalUnitVO orgProfile = orgProfiles.getOrThrow(approver.getOuId()); OrganizationalUnitVO orgProfile = orgProfiles.getOrThrow(approver.getOuId());
PersonProfileDto personProfile = personProfiles.getOrThrow(approver.getPersonId()); PersonProfileDto personProfile = personProfiles.getOrThrow(approver.getPersonId());
@ -237,6 +236,11 @@ public class EssClient implements InitializingBean {
approverInfo.setOrganizationName(orgProfile.getName()); approverInfo.setOrganizationName(orgProfile.getName());
approverInfo.setOrganizationOpenId(OrgOpenId.ofPerson(approver).toOpenId()); approverInfo.setOrganizationOpenId(OrgOpenId.ofPerson(approver).toOpenId());
} }
if (approver.getSignOption() != null) {
approverOption.setNoRefuse(approver.getSignOption().isNoRefuse());
approverOption.setNoTransfer(approver.getSignOption().isNoTransfer());
}
approverInfo.setApproverOption(approverOption);
approverInfo.setApproverType(approver.getApproverType().name()); approverInfo.setApproverType(approver.getApproverType().name());
approverInfo.setNotifyType("NONE"); approverInfo.setNotifyType("NONE");
approverInfo.setPreReadTime(approver.getPreReadTimeSeconds()); approverInfo.setPreReadTime(approver.getPreReadTimeSeconds());