From 23d0cea8960a1a79809be5eadb2640ea5f7d03eb Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 21 Feb 2025 11:49:26 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E8=BF=94=E5=9B=9E=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E8=AE=A4=E8=AF=81=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanopart/ess/api/enums/EssContractState.java | 11 ----------- .../ess/api/response/GetOrgAuthStatesResponse.java | 6 +++++- .../cn/axzo/nanopart/ess/server/dao/EssOrgDao.java | 2 +- .../nanopart/ess/server/entity/EssContract.java | 4 ---- .../cn/axzo/nanopart/ess/server/ess/EssService.java | 4 +--- .../axzo/nanopart/ess/server/ess/QueryService.java | 13 ++++++++++++- .../nanopart/ess/server/ess/support/EssProps.java | 2 -- 7 files changed, 19 insertions(+), 23 deletions(-) diff --git a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/enums/EssContractState.java b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/enums/EssContractState.java index f792685f..75bc6e24 100644 --- a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/enums/EssContractState.java +++ b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/enums/EssContractState.java @@ -4,12 +4,6 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -import static java.util.stream.Collectors.toList; - /** * @author yanglin */ @@ -42,9 +36,4 @@ public enum EssContractState { return null; } - public static List collectFinalStates() { - return Arrays.stream(values()) - .filter(EssContractState::isFinalState) - .collect(toList()); - } } \ No newline at end of file diff --git a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/response/GetOrgAuthStatesResponse.java b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/response/GetOrgAuthStatesResponse.java index 08338b98..31c52e17 100644 --- a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/response/GetOrgAuthStatesResponse.java +++ b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/response/GetOrgAuthStatesResponse.java @@ -20,8 +20,12 @@ public class GetOrgAuthStatesResponse { private boolean isAuthorized; /** - * 单位创建人id, 可能为空 + * 单位创建人id */ private Long createByPersonId; + /** + * 单位创建人姓名 + */ + private String createByPersonName; } \ No newline at end of file diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java index cc493cb1..626bf1ee 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java @@ -1,8 +1,8 @@ package cn.axzo.nanopart.ess.server.dao; +import cn.axzo.nanopart.ess.api.utils.YesOrNo; import cn.axzo.nanopart.ess.server.entity.EssOrg; import cn.axzo.nanopart.ess.server.mapper.EssOrgMapper; -import cn.axzo.nanopart.ess.api.utils.YesOrNo; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java index bea0355a..e63c018a 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java @@ -138,10 +138,6 @@ public class EssContract extends BaseEntity { .findFirst(); } - public Constraint getAssignType() { - return assignment == null ? null : assignment.getConstraint(); - } - public boolean isAllSignPersonPreset() { return approvers.stream().allMatch(Approver::isSignPersonPresent); } diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java index f82139b9..0fdc05ee 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java @@ -152,10 +152,8 @@ public class EssService { public String getContractPDFUrl(String essContractId) { EssContract contract = essContractDao.getOrThrow(essContractId); - if (essProps.isUseContractPdfOnOss() - && StringUtils.isNotBlank(contract.getOssFileKey())) { + if (StringUtils.isNotBlank(contract.getOssFileKey())) return ossService.getOssUrl(contract.getOssFileKey()); - } maybeUploadContractToOss(contract); return getContractPDFUrlFromEss(contract); } diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java index 097b45bf..942703f0 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java @@ -34,7 +34,9 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; +import java.util.stream.Collectors; import static java.util.Collections.emptyList; import static java.util.function.Function.identity; @@ -57,6 +59,11 @@ public class QueryService { public List getOrgAuthStates(GetOrgAuthStatesRequest request) { List orgs = essOrgDao.getByOuIds(request.getOuIds()); + List creatorPersonIds = orgs.stream() + .map(EssOrg::getCreateByPersonId) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + PersonProfiles personProfiles = PersonProfiles.wrap(essSupport.getPersonProfiles(creatorPersonIds)); ArrayList responses = new ArrayList<>(); for (Long ouId : request.getOuIds()) { EssOrg org = orgs.stream() @@ -66,8 +73,12 @@ public class QueryService { GetOrgAuthStatesResponse response = new GetOrgAuthStatesResponse(); responses.add(response); response.setOuId(ouId); - response.setCreateByPersonId(org == null ? null : org.getCreateByPersonId()); response.setAuthorized(org != null && org.isAuthorized()); + response.setCreateByPersonId(org == null ? null : org.getCreateByPersonId()); + if (response.getCreateByPersonId() != null) { + PersonProfileDto person = personProfiles.findOrNull(response.getCreateByPersonId()); + response.setCreateByPersonName(person == null ? "" : person.getRealName()); + } } return responses; } diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/EssProps.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/EssProps.java index 653c5d3d..96c56f4e 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/EssProps.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/EssProps.java @@ -28,8 +28,6 @@ public class EssProps { private boolean testEnv; - private boolean useContractPdfOnOss = true; - private String ossAppCode = "elec-signature-contract"; private String ossBizScene = "elec-signature-contract";