From a1f33a364dc5579e0312996e716fffbe59204dca Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 7 Feb 2025 17:04:38 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3300)=20-=20=E8=B0=83=E6=95=B4=20IM=20?= =?UTF-8?q?=E7=BE=A4=E6=88=90=E5=91=98=E5=8F=98=E5=8A=A8=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E6=93=8D=E4=BD=9C=E5=AF=B9=E5=BA=94=E7=9A=84=E6=8A=95?= =?UTF-8?q?=E7=A5=A8=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ChangeRecordRelationService.java | 3 +- .../impl/ChangeRecordRelationServiceImpl.java | 48 ++++++++++++++++--- .../service/impl/ChangeRecordServiceImpl.java | 19 +++++--- 3 files changed, 56 insertions(+), 14 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordRelationService.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordRelationService.java index 8922fe35..bc2d79c3 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordRelationService.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordRelationService.java @@ -1,6 +1,7 @@ package cn.axzo.nanopart.visa.server.service; import cn.axzo.nanopart.visa.api.enums.VisaRelationFieldEnum; +import cn.axzo.nanopart.visa.api.request.ImGroupOperationClearReq; import cn.axzo.nanopart.visa.api.request.ImGroupOperationReq; import cn.axzo.nanopart.visa.api.request.ImGroupTipsQueryReq; import cn.axzo.nanopart.visa.api.request.VisaChangeTempCreateReq; @@ -45,7 +46,7 @@ public interface ChangeRecordRelationService extends IService implements ChangeRecordRelationService { private final ChangeRecordService changeRecordService; private final VisaProfileGateway visaProfileGateway; + private final MsgCenterGateway msgCenterGateway; /** * 保存 @@ -130,6 +138,9 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl byCondition = findByCondition(VisaRelationDto.builder() + .visaId(req.getVisaId()) + .varName(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE.getCode()) + .content(String.valueOf(req.getOperatorOuId())) + .contentExt(NumberUtil.isPositiveNumber(req.getOperatorWorkspaceId()) ? String.valueOf(req.getOperatorWorkspaceId()) : null) + .createBy(req.getOperatorPersonId()) + .build()); + removeByIds(byCondition.stream().map(ChangeRecordRelation::getVisaId).collect(Collectors.toList())); + } + return true; } @@ -172,6 +207,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl imGroupParticipate = findByCondition(VisaRelationDto.builder() .visaId(req.getVisaId()) .varName(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE.getCode()) 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 ad4b405b..789de120 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 @@ -31,7 +31,7 @@ import cn.axzo.nanopart.visa.api.enums.VisaStatusEnum; import cn.axzo.nanopart.visa.api.enums.VisaTypeEnum; import cn.axzo.nanopart.visa.api.request.ChangeRecordButtonOperationReq; import cn.axzo.nanopart.visa.api.request.ChangeStatusRequest; -import cn.axzo.nanopart.visa.api.request.ImGroupOperationReq; +import cn.axzo.nanopart.visa.api.request.ImGroupOperationClearReq; import cn.axzo.nanopart.visa.api.request.VisaChangeApproveCreateReq; import cn.axzo.nanopart.visa.api.request.VisaChangeApproveOnlyReq; import cn.axzo.nanopart.visa.api.request.VisaChangeDiscussCreateReq; @@ -123,7 +123,9 @@ import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_RELATIO import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_RELATION_TASK_ORDER; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_RELATION_VISA_ORDER; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_TOPIC; -import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_BIZ_INFO_RECORD_ID; +import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_BIZ_INFO_OWNER_WORKSPACE_ID; +import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_BIZ_INFO_VISA_ID; +import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_BIZ_INFO_VISA_TYPE; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.WORKFLOW_PENDING_TOPIC; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.WORKFLOW_VAR_VISA_TYPE_KEY; @@ -577,7 +579,9 @@ public class ChangeRecordServiceImpl extends ServiceImpl