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-28 14:10:46 +08:00
parent 891b084579
commit 47296c64f6
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/OrgPersonInfo.java
View File

@ -4,6 +4,7 @@ package cn.axzo.nanopart.ess.api.domain.contract;
import cn.axzo.nanopart.ess.api.domain.OrgPerson; import cn.axzo.nanopart.ess.api.domain.OrgPerson;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.web.context.request.async.StandardServletAsyncWebRequest;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -15,6 +16,13 @@ import javax.validation.constraints.NotNull;
@Getter @Getter
public class OrgPersonInfo implements OrgPerson { public class OrgPersonInfo implements OrgPerson {
public static OrgPersonInfo create(Long ouId, Long personId) {
OrgPersonInfo orgPersonInfo = new OrgPersonInfo();
orgPersonInfo.setOuId(ouId);
orgPersonInfo.setPersonId(personId);
return orgPersonInfo;
}
/** /**
* 单位id * 单位id
*/ */

14
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java
View File

@ -9,6 +9,7 @@ import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import cn.axzo.nanopart.ess.api.domain.OrgPerson; import cn.axzo.nanopart.ess.api.domain.OrgPerson;
import cn.axzo.nanopart.ess.api.domain.contract.OrgPersonInfo;
import cn.axzo.nanopart.ess.api.enums.EssPersonState; import cn.axzo.nanopart.ess.api.enums.EssPersonState;
import cn.axzo.nanopart.ess.api.enums.EssSealState; import cn.axzo.nanopart.ess.api.enums.EssSealState;
import cn.axzo.nanopart.ess.api.enums.EssSealType; import cn.axzo.nanopart.ess.api.enums.EssSealType;
@ -156,7 +157,18 @@ public class OrgManager {
} }
@BizTransactional @BizTransactional
public void maybeAddSealPerson(String essSealId, Long personId) { public void addSealPerson(String essSealId, Long personId) {
EssSeal seal = essSealDao.findByEssSealId(essSealId).orElse(null);
BizAssertions.assertNotNull(seal, "印章不存在: {}", essSealId);
//noinspection DataFlowIssue
getOrCreateOrgPerson(OrgPersonInfo.create(seal.getOuId(), personId));
maybeAddSealPerson(essSealId, personId);
}
/**
* should be called in transaction
*/
private void maybeAddSealPerson(String essSealId, Long personId) {
EssSeal seal = essSealDao.findByEssSealId(essSealId).orElse(null); EssSeal seal = essSealDao.findByEssSealId(essSealId).orElse(null);
BizAssertions.assertNotNull(seal, "印章不存在: {}", essSealId); BizAssertions.assertNotNull(seal, "印章不存在: {}", essSealId);
EssSealPerson savedSealPerson = essSealPersonDao.find(essSealId, personId, true).orElse(null); EssSealPerson savedSealPerson = essSealPersonDao.find(essSealId, personId, true).orElse(null);

9
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/ApiController.java
View File

@ -1,6 +1,10 @@
package cn.axzo.nanopart.ess.server.ess.controller; package cn.axzo.nanopart.ess.server.ess.controller;
import java.util.List;
import org.springframework.web.bind.annotation.RestController;
import cn.axzo.basics.common.BeanMapper; import cn.axzo.basics.common.BeanMapper;
import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.nanopart.ess.api.EssApi; import cn.axzo.nanopart.ess.api.EssApi;
@ -39,9 +43,6 @@ import cn.axzo.nanopart.ess.server.ess.OrgManager;
import cn.axzo.nanopart.ess.server.ess.QueryService; import cn.axzo.nanopart.ess.server.ess.QueryService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/** /**
* @author yanglin * @author yanglin
@ -100,7 +101,7 @@ class ApiController implements EssApi {
@Override @Override
public ApiResult<Void> addSealPerson(AddSealPersonRequest request) { public ApiResult<Void> addSealPerson(AddSealPersonRequest request) {
log.info("addSealPerson request={}", request); log.info("addSealPerson request={}", request);
orgManager.maybeAddSealPerson(request.getEssSealId(), request.getPersonId()); orgManager.addSealPerson(request.getEssSealId(), request.getPersonId());
return ApiResult.ok(); return ApiResult.ok();
} }