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-24 19:42:16 +08:00
parent 826f91e847
commit fabb3c7a28
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java
View File

@ -88,9 +88,8 @@ public class ContractManager {
@BizTransactional @BizTransactional
public void revokeContract(RevokeContractRequest request) { public void revokeContract(RevokeContractRequest request) {
essLogDao.logRequest("revokeContract", request.getEssContractId(), request); essLogDao.logRequest("revokeContract", request.getEssContractId(), request);
EssContract contract = essContractDao.getOrThrow(request.getEssContractId()); // lock when updating state
BizAssertions.assertFalse(contract.isFinalState(), EssContract contract = essContractDao.findForUpdateOrNull(request.getEssContractId());
"合同已是最终状态 {}, 无法撤销", contract.getState().getDescription());
EssPerson superAdmin = getContractSuperAdmin(contract); EssPerson superAdmin = getContractSuperAdmin(contract);
essClient.revokeContract(superAdmin, contract.getEssContractId(), request.getReason()); essClient.revokeContract(superAdmin, contract.getEssContractId(), request.getReason());
updateContractState(contract, EssContractState.CANCEL, null, request.getReason()); updateContractState(contract, EssContractState.CANCEL, null, request.getReason());

2
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/ContractSupport.java
View File

@ -7,7 +7,6 @@ import cn.axzo.nanopart.ess.api.enums.EssContractState;
import cn.axzo.nanopart.ess.api.request.CreateContractByFileRequest; import cn.axzo.nanopart.ess.api.request.CreateContractByFileRequest;
import cn.axzo.nanopart.ess.api.response.CreateContractByFileResponse; import cn.axzo.nanopart.ess.api.response.CreateContractByFileResponse;
import cn.axzo.nanopart.ess.server.dao.EssContractDao; import cn.axzo.nanopart.ess.server.dao.EssContractDao;
import cn.axzo.nanopart.ess.server.dao.EssLogDao;
import cn.axzo.nanopart.ess.server.dao.EssOrgDao; import cn.axzo.nanopart.ess.server.dao.EssOrgDao;
import cn.axzo.nanopart.ess.server.entity.EssContract; import cn.axzo.nanopart.ess.server.entity.EssContract;
import cn.axzo.nanopart.ess.server.entity.EssOrg; import cn.axzo.nanopart.ess.server.entity.EssOrg;
@ -33,7 +32,6 @@ public class ContractSupport {
private final EssOrgDao essOrgDao; private final EssOrgDao essOrgDao;
private final EssContractDao essContractDao; private final EssContractDao essContractDao;
private final EssLogDao essLogDao;
public void validateCreateContract(CreateContractInfo contract) { public void validateCreateContract(CreateContractInfo contract) {
checkCreateContractConstraint(contract); checkCreateContractConstraint(contract);

5
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/OrgProfiles.java
View File

@ -5,7 +5,6 @@ import cn.axzo.nanopart.ess.server.utils.BizAssertions;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@ -17,10 +16,6 @@ public class OrgProfiles {
private final List<OrganizationalUnitVO> profiles; private final List<OrganizationalUnitVO> profiles;
public static OrgProfiles empty() {
return new OrgProfiles(Collections.emptyList());
}
public static OrgProfiles wrap(List<OrganizationalUnitVO> profiles) { public static OrgProfiles wrap(List<OrganizationalUnitVO> profiles) {
return new OrgProfiles(profiles); return new OrgProfiles(profiles);
} }