From 39c3a295a2ccde67a7434c0d2d7ebcef3b9ea459 Mon Sep 17 00:00:00 2001 From: xudawei Date: Thu, 20 Feb 2025 11:55:27 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20(REQ-3300)=20=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E5=8F=98=E6=9B=B4/=E9=99=84=E4=BB=B6=E7=9A=84=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/api/request/ChangeStatusRequest.java | 6 +-- .../visa/server/dto/VisaLogParam.java | 38 ++++++++++++++++++- .../service/impl/ChangeRecordServiceImpl.java | 37 +++++++++++++++--- 3 files changed, 71 insertions(+), 10 deletions(-) diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeStatusRequest.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeStatusRequest.java index 820e1e28..674ee59d 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeStatusRequest.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeStatusRequest.java @@ -3,7 +3,7 @@ package cn.axzo.nanopart.visa.api.request; import cn.axzo.framework.domain.ServiceException; import cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum; import cn.axzo.nanopart.visa.api.enums.VisaStatusEnum; -import com.alibaba.fastjson.JSONObject; +import cn.axzo.nanopart.visa.api.response.VisaDetailByIdResponse; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -73,11 +73,11 @@ public class ChangeStatusRequest { /** * 新的附件 */ - private List newAttach; + private List newAttach; /** * 原的附件 */ - private List oldAttach; + private List oldAttach; /** * 是否编辑表单 diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/dto/VisaLogParam.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/dto/VisaLogParam.java index 89aa170a..8dd99778 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/dto/VisaLogParam.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/dto/VisaLogParam.java @@ -94,12 +94,29 @@ public class VisaLogParam { return fetchChangeAttach(oldAttach, newAttach); } + /** + * 获取删除附件信息 + */ + public static List deleteAttachWithObject(List oldAttach, List newAttach) { + return fetchChangeAttachWithObject(oldAttach, newAttach); + } + /** * 获取上传的附件信息 */ public static List uploadAttach(List newAttach, List oldAttach) { return fetchChangeAttach(newAttach, oldAttach); } + + /** + * 获取上传的附件信息 + */ + public static List uploadAttachWithObject(List newAttach, List oldAttach) { + return fetchChangeAttachWithObject(newAttach, oldAttach); + } + + + /** * 获取变动的附件信息 * 计算集合的单差集，即只返回【集合1】中有，但是【集合2】中没有的元素，例如： @@ -116,7 +133,26 @@ public class VisaLogParam { } List newFileDtoList = VisaDetailByIdResponse.VisaUploadFile.createListByJson(compareSec); - Collection substractList = CollUtil.subtractToList(oldFileDtoList, newFileDtoList); + return fetchChangeAttachWithObject(oldFileDtoList, newFileDtoList); + } + + + + /** + * 获取变动的附件信息 + * 计算集合的单差集，即只返回【集合1】中有，但是【集合2】中没有的元素，例如： + * subtractToList([1,2,3,4],[2,3,4,5]) -》 [1] + */ + private static List fetchChangeAttachWithObject(List compareFir, List compareSec) { + if (CollectionUtils.isEmpty(compareFir)) { + return Lists.newArrayList(); + } + + if (CollectionUtils.isEmpty(compareSec)) { + return compareFir.stream().map(VisaDetailByIdResponse.VisaUploadFile::getFileName).collect(Collectors.toList()); + } + + Collection substractList = CollUtil.subtractToList(compareFir, compareSec); if (CollectionUtils.isEmpty(substractList)) { return Lists.newArrayList(); } 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 1e0efb95..0ca0bbb6 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 @@ -263,8 +263,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl visaUploadFiles = this.buildAttachUploadFile(req.getId()); + /*保存签证信息*/ Long visaId = tempCreateVisaChangeRecord(req); @@ -717,16 +720,38 @@ public class ChangeRecordServiceImpl extends ServiceImpl visaUploadFiles) { + ChangeStatusRequest changeStatusRequest = ChangeStatusRequest.builder() .visaId(visaId) .updateStatus(VisaStatusEnum.APPROVING) .personId(req.getOperatorPersonId()) .ouId(req.getOperatorOuId()) .workspaceId(req.getRelationWorkspaceId()) .editFormFlag(true) - .build()); - return visaId; + .newAmountChange(req.getAmountChange()) + .oldAmountChange(changeRecord.getAmountChange()) + .build(); + + if (CollectionUtils.isNotEmpty(req.getAttach())) { + changeStatusRequest.setNewAttach(BeanUtil.copyToList(req.getAttach(), VisaDetailByIdResponse.VisaUploadFile.class)); + } + if (CollectionUtils.isNotEmpty(visaUploadFiles)) { + changeStatusRequest.setOldAttach(visaUploadFiles); + } + // 更新主表状态 + changeStatus(changeStatusRequest); } private String createProcessInstance(VisaChangeApproveCreateReq req, Long visaId) { From fe8b3cd32c771542689d918b414c0560a90a2283 Mon Sep 17 00:00:00 2001 From: xudawei Date: Thu, 20 Feb 2025 12:51:46 +0800 Subject: [PATCH 2/8] feat: (REQ-3300) fix-complier-error --- .../java/cn/axzo/nanopart/visa/server/service/VisaHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java index 3160571e..216a0e94 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java @@ -100,8 +100,8 @@ public class VisaHelper { .workspaceId(newContext.getWorkspaceId()) .newAmountChange(newContext.getChangeRecord().getAmountChange()) .oldAmountChange(oldContext.getChangeRecord().getAmountChange()) - .newAttach(newContext.getAttachList()) - .oldAttach(oldContext.getAttachList()) +// .newAttach(newContext.getAttachList()) +// .oldAttach(oldContext.getAttachList()) .editFormFlag(true) .build()); } From 4f391a49142285ab2e53472337d737f727f52330 Mon Sep 17 00:00:00 2001 From: xudawei Date: Thu, 20 Feb 2025 13:09:25 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20(REQ-3300)=20=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8A=A0=E4=B8=8A=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/server/service/impl/ChangeRecordLogServiceImpl.java | 3 ++- .../visa/server/service/impl/ChangeRecordServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java index 55eb4205..c8b15987 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java @@ -16,6 +16,7 @@ import cn.axzo.nanopart.visa.server.utils.Constants; import cn.axzo.orggateway.api.nodeuser.dto.OrgNodeUserDTO; import cn.axzo.orggateway.api.nodeuser.req.ListOrgNodeUserReq; import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; @@ -79,7 +80,7 @@ public class ChangeRecordLogServiceImpl extends ServiceImpl buildLogList(Long visaId, VisaLogTypeEnum type, VisaLogParam param) { - + log.info("buildLogList,visaId={},type={},param={}", visaId, type, JSON.toJSONString(param)); if (Objects.isNull(visaId) || Objects.isNull(type)) { return Lists.newArrayList(); } 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 0ca0bbb6..b4d29123 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 @@ -246,6 +246,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl logList = Lists.newArrayList(); // 1 由[决策中｜执行中] -> [审批中] 执行变更签证属性变更 if (Objects.nonNull(param.getOldStatus()) && Objects.nonNull(param.getNewStatus()) From 86f6709a9a13adf1d77dff947a0148e65bf01268 Mon Sep 17 00:00:00 2001 From: xudawei Date: Thu, 20 Feb 2025 14:16:14 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat:=20(REQ-3300)=20=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8A=A0=E4=B8=8A=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/server/service/impl/ChangeRecordServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 b4d29123..ca6aa551 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 @@ -709,6 +709,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl visaUploadFiles = this.buildAttachUploadFile(req.getId()); /*保存签证信息*/ @@ -721,7 +722,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl Date: Thu, 20 Feb 2025 14:55:20 +0800 Subject: [PATCH 5/8] =?UTF-8?q?feat(REQ-3300)=20-=20=E5=BC=BA=E5=88=B6=20M?= =?UTF-8?q?Q=20=E7=9B=91=E5=90=AC=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/server/mq/listener/im/ImGroupsCreatedEventHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupsCreatedEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupsCreatedEventHandler.java index 1d7bb415..60f696dd 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupsCreatedEventHandler.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupsCreatedEventHandler.java @@ -88,6 +88,7 @@ public class ImGroupsCreatedEventHandler implements EventHandler, InitializingBe sendCardAndMsgToImGroup(group); } catch (Exception e) { log.error("send msg to im group error: {}", e.getMessage(), e); + throw e; } log.info("receive create im group event, handle success: {}", JSON.toJSONString(event)); } From 26e4e6c8bf72f8c831e8d1afc7cd3530936c7733 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Thu, 20 Feb 2025 15:06:44 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feat(REQ-3300)=20-=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=B8=BB=E5=8D=95=E6=8D=AE=E5=88=9B=E5=BB=BA=E7=BE=A4=E8=81=8A?= =?UTF-8?q?=E6=97=B6,=E5=B0=B1=E5=8F=91=E9=80=81=E5=8D=A1=E7=89=87,?= =?UTF-8?q?=E8=80=8C=E4=B8=8D=E5=86=8D=E7=9B=91=E5=90=AC=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/mq/listener/im/ImGroupsCreatedEventHandler.java | 3 ++- .../visa/server/service/impl/ChangeRecordServiceImpl.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupsCreatedEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupsCreatedEventHandler.java index 60f696dd..f49d53a5 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupsCreatedEventHandler.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupsCreatedEventHandler.java @@ -85,7 +85,8 @@ public class ImGroupsCreatedEventHandler implements EventHandler, InitializingBe GroupInfo group = groupChangedMessage.getGroup(); AssertUtil.notNull(group, "group info is null"); try { - sendCardAndMsgToImGroup(group); + // 转移到创建群聊立即发送卡片 + // sendCardAndMsgToImGroup(group); } catch (Exception e) { log.error("send msg to im group error: {}", e.getMessage(), e); throw e; 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 ca6aa551..fbbc1eeb 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 @@ -673,6 +673,13 @@ public class ChangeRecordServiceImpl extends ServiceImpl Date: Thu, 20 Feb 2025 16:01:56 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feat(REQ-3300)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BE=A4=E8=81=8A=E5=8F=8A=E5=8F=91=E9=80=81?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/server/service/impl/ChangeRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fbbc1eeb..da06caa5 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 @@ -672,6 +672,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl Date: Thu, 20 Feb 2025 16:26:47 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat:(feature/REQ-3581)=20visaRelation?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0id=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/nanopart/visa/api/request/VisaRelationReq.java | 2 ++ .../server/controller/ChangeRecordRelationController.java | 1 + .../cn/axzo/nanopart/visa/server/dto/VisaRelationDto.java | 1 + .../server/service/impl/ChangeRecordRelationServiceImpl.java | 4 +++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaRelationReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaRelationReq.java index ea9a5c45..17e465bf 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaRelationReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaRelationReq.java @@ -33,4 +33,6 @@ public class VisaRelationReq { * 可为空，则查询所有关联的数据 */ private VisaRelationFieldEnum fieldEnum; + + private Long id; } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java index ac34849c..ef800c87 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java @@ -37,6 +37,7 @@ public class ChangeRecordRelationController implements ChangeRecordRelationApi { return ApiResult.ok(changeRecordRelationService.findByCondition(VisaRelationDto.builder() .visaId(req.getVisaId()) .varName(Objects.nonNull(req.getFieldEnum()) ? req.getFieldEnum().name() : null) + .id(req.getId()) .build()) .stream().sorted(Comparator.comparing(ChangeRecordRelation::getCreateAt)) .map(i -> VisaRelationResp.builder() diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/dto/VisaRelationDto.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/dto/VisaRelationDto.java index 69d40f88..c87092ce 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/dto/VisaRelationDto.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/dto/VisaRelationDto.java @@ -43,4 +43,5 @@ public class VisaRelationDto { */ private Long createBy; + private Long id; } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java index 04cd4f59..e510240c 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java @@ -150,7 +150,9 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl