From 00e439cfecc77e3ebbda30bed7b5442b5dcabc01 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 26 Feb 2025 15:28:38 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3581)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=8F=98=E6=B4=BD=E7=AD=BE=E8=AF=A6=E6=83=85=E9=A1=B5=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/response/VisaDetailByIdResponse.java | 11 +++ .../controller/ChangeRecordController.java | 2 +- .../service/ChangeRecordConfirmService.java | 3 +- .../impl/ChangeRecordConfirmServiceImpl.java | 71 ++++++++++++------- .../service/impl/ChangeRecordServiceImpl.java | 1 + 5 files changed, 59 insertions(+), 29 deletions(-) diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java index d05a1f43..03faf3e3 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java @@ -2,6 +2,7 @@ package cn.axzo.nanopart.visa.api.response; import cn.axzo.maokai.common.enums.SaasCooperateShipCooperateTypeEnum; import cn.axzo.nanopart.visa.api.enums.VisaButtonTypeEnum; +import cn.axzo.nanopart.visa.api.enums.VisaStampStatusEnum; import cn.axzo.nanopart.visa.api.enums.VisaStatusEnum; import cn.axzo.nanopart.visa.api.enums.VisaTypeEnum; import cn.axzo.nanopart.visa.api.request.VisaChangeTempCreateReq; @@ -216,6 +217,16 @@ public class VisaDetailByIdResponse { */ private Long currentPersonId; + /** + * 合同 ID + */ + private String contractId; + + /** + * 用印状态 + */ + private VisaStampStatusEnum stampStatus; + @Data @Builder @NoArgsConstructor diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java index e825ee1b..061ee3a5 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java @@ -98,7 +98,7 @@ public class ChangeRecordController implements ChangeRecordApi { if (req.isNeedBtnList()) { // resp.setBtnList(VisaButtonTypeEnum.sort(VisaButtonTypeEnum.all())); - resp.setBtnList(changeRecordConfirmService.fetchBtnsByCondition(req.getVisaId(), req.getPersonId(), req.getOuId(), req.getWorkspaceId(), resp.getStatus(), resp.getApprovalId())); + resp.setBtnList(changeRecordConfirmService.fetchBtnsByCondition(req.getVisaId(), req.getPersonId(), req.getOuId(), req.getWorkspaceId(), resp.getStatus(), resp.getApprovalId(), resp.getStampStatus())); } return ApiResult.ok(resp); } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordConfirmService.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordConfirmService.java index a60f4a29..7a5f46f9 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordConfirmService.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordConfirmService.java @@ -2,6 +2,7 @@ package cn.axzo.nanopart.visa.server.service; import cn.axzo.nanopart.visa.api.enums.VisaButtonTypeEnum; import cn.axzo.nanopart.visa.api.enums.VisaConfirmBizTypeEnum; +import cn.axzo.nanopart.visa.api.enums.VisaStampStatusEnum; import cn.axzo.nanopart.visa.api.enums.VisaStatusEnum; import cn.axzo.nanopart.visa.api.enums.VisaTypeEnum; import cn.axzo.nanopart.visa.api.request.VisaChangeApproveCreateReq; @@ -58,7 +59,7 @@ public interface ChangeRecordConfirmService { * 获取按钮集合 * 确认人与发起人的不同的单据状态，按钮列表不相同 */ - List fetchBtnsByCondition(Long visaId, Long personId, Long ouId, Long workspaceId, VisaStatusEnum status, String approvalId); + List fetchBtnsByCondition(Long visaId, Long personId, Long ouId, Long workspaceId, VisaStatusEnum status, String approvalId, VisaStampStatusEnum stampStatus); /** * 权限过滤 diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordConfirmServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordConfirmServiceImpl.java index 69a35563..fe1027c1 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordConfirmServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordConfirmServiceImpl.java @@ -11,6 +11,7 @@ import cn.axzo.maokai.api.vo.response.OrganizationalUnitVO; import cn.axzo.nanopart.visa.api.enums.VisaButtonTypeEnum; import cn.axzo.nanopart.visa.api.enums.VisaConfirmBizTypeEnum; import cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum; +import cn.axzo.nanopart.visa.api.enums.VisaStampStatusEnum; import cn.axzo.nanopart.visa.api.enums.VisaStatusEnum; import cn.axzo.nanopart.visa.api.enums.VisaTypeEnum; import cn.axzo.nanopart.visa.api.request.VisaChangeApproveCreateReq; @@ -128,7 +129,7 @@ public class ChangeRecordConfirmServiceImpl extends ServiceImpl fetchBtnsByCondition(Long visaId, Long personId, Long ouId, Long workspaceId, VisaStatusEnum status, String approvalId) { + public List fetchBtnsByCondition(Long visaId, Long personId, Long ouId, Long workspaceId, VisaStatusEnum status, String approvalId, VisaStampStatusEnum stampStatus) { Set bizTypes = fetchBizTypesByCondition(visaId, personId, ouId, workspaceId); //添加审批人添加到集合bizTypes中 this.addBizTypeApprove(bizTypes, visaId, personId, ouId, workspaceId); @@ -152,6 +153,23 @@ public class ChangeRecordConfirmServiceImpl extends ServiceImpl fetchOrgNodeUserDTOList(List personIds, Long ouId, Long workspaceId) { PageResp pageResp = visaOrganizationalNodeUserGateway.list(ListOrgNodeUserReq.builder() - .personIds(personIds) + .personIds(personIds) .organizationalUnitId(ouId) .workspaceId(workspaceId) .needs(ListNodeUserReq.Needs.builder().job(true).unit(true).personProfile(true).build()).build()); @@ -307,40 +325,39 @@ public class ChangeRecordConfirmServiceImpl extends ServiceImpl buildRelationPersonList(List confirmList,Map> personNodeUserMap) { + private List buildRelationPersonList(List confirmList, Map> personNodeUserMap) { return confirmList.stream().map(item -> { - List orgNodeUserDTOS = personNodeUserMap.get(item.getPersonId()); - //有班组时，优先取班组岗位 - OrgNodeUserDTO nodeUserDTO = Constants.nodeUserDTOByList(orgNodeUserDTOS); + List orgNodeUserDTOS = personNodeUserMap.get(item.getPersonId()); + //有班组时，优先取班组岗位 + OrgNodeUserDTO nodeUserDTO = Constants.nodeUserDTOByList(orgNodeUserDTOS); - VisaDetailByIdResponse.RelationPerson relationPerson = VisaDetailByIdResponse.RelationPerson.builder() - .ouId(item.getOuId()) - .workspaceId(item.getWorkspaceId()) - .nodeId(item.getNodeId()) - .personId(item.getPersonId()) - .projectId(item.getProjectId()) - .type(item.getType()) - .build(); - if (Objects.nonNull(nodeUserDTO)) { - relationPerson.setRealName(nodeUserDTO.getRealName()); + VisaDetailByIdResponse.RelationPerson relationPerson = VisaDetailByIdResponse.RelationPerson.builder() + .ouId(item.getOuId()) + .workspaceId(item.getWorkspaceId()) + .nodeId(item.getNodeId()) + .personId(item.getPersonId()) + .projectId(item.getProjectId()) + .type(item.getType()) + .build(); + if (Objects.nonNull(nodeUserDTO)) { + relationPerson.setRealName(nodeUserDTO.getRealName()); - if (Objects.nonNull(nodeUserDTO.getPersonProfile())) { - relationPerson.setAvatarUrl(nodeUserDTO.getPersonProfile().getAvatarUrl()); + if (Objects.nonNull(nodeUserDTO.getPersonProfile())) { + relationPerson.setAvatarUrl(nodeUserDTO.getPersonProfile().getAvatarUrl()); + } + + if (Objects.nonNull(nodeUserDTO.getJob())) { + relationPerson.setJobId(nodeUserDTO.getJob().getId()); + relationPerson.setJobName(nodeUserDTO.getJob().getName()); + } + } + return relationPerson; } - - if (Objects.nonNull(nodeUserDTO.getJob())) { - relationPerson.setJobId(nodeUserDTO.getJob().getId()); - relationPerson.setJobName(nodeUserDTO.getJob().getName()); - } - } - return relationPerson; - } ).collect(Collectors.toList()); } - /** * 构建人员的集合，key:personId,value:realName */ diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index 99d57113..b1f7a410 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -425,6 +425,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl