From f85ea2e40461dc3b650ce2bc71d5c4fab0b564b2 Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Mon, 10 Feb 2025 14:37:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3300):=20=E5=8F=91=E8=B5=B7=E7=BE=A4?=
 =?UTF-8?q?=E8=81=8A=E5=93=8D=E5=BA=94=E5=AF=B9=E8=B1=A1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/changerecord/ChangeRecordApi.java     |  3 +-
 .../response/VisaChangeDiscussCreateResp.java | 33 +++++++++++++++++++
 .../controller/ChangeRecordController.java    |  4 +--
 .../server/service/ChangeRecordService.java   |  3 +-
 .../service/impl/ChangeRecordServiceImpl.java |  9 +++--
 5 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaChangeDiscussCreateResp.java

diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java
index c845bd4f..d1ed0932 100644
--- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java
+++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java
@@ -13,6 +13,7 @@ import cn.axzo.nanopart.visa.api.request.VisaChangePageSearchReq;
 import cn.axzo.nanopart.visa.api.request.VisaChangeTempCreateReq;
 import cn.axzo.nanopart.visa.api.request.VisaDetailByIdRequest;
 import cn.axzo.nanopart.visa.api.request.VisaInitiatorListReq;
+import cn.axzo.nanopart.visa.api.response.VisaChangeDiscussCreateResp;
 import cn.axzo.nanopart.visa.api.response.VisaChangeInitiatorResp;
 import cn.axzo.nanopart.visa.api.response.VisaChangePageSearchResp;
 import cn.axzo.nanopart.visa.api.response.VisaDetailByIdResponse;
@@ -48,7 +49,7 @@ public interface ChangeRecordApi {
      * @return 签证变更记录id
      */
     @PostMapping("/api/visa/change/discussCreate")
-    ApiResult<Long> discussCreateVisaChangeRecord(@RequestBody VisaChangeDiscussCreateReq req);
+    ApiResult<VisaChangeDiscussCreateResp> discussCreateVisaChangeRecord(@RequestBody VisaChangeDiscussCreateReq req);
 
     /**
      * 发起变更签证审批
diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaChangeDiscussCreateResp.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaChangeDiscussCreateResp.java
new file mode 100644
index 00000000..bb0f3633
--- /dev/null
+++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaChangeDiscussCreateResp.java
@@ -0,0 +1,33 @@
+package cn.axzo.nanopart.visa.api.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author chenwenjian
+ * @version 1.0
+ * @date 2025/2/10 14:17
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class VisaChangeDiscussCreateResp {
+
+    /**
+     * 变洽签单据id
+     */
+    private Long visaId;
+
+    /**
+     * 群聊id
+     */
+    private Long imGroupId;
+
+    /**
+     * 群聊名称
+     */
+    private String imGroupName;
+}
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 9f9940a1..25517b1a 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
@@ -16,12 +16,12 @@ import cn.axzo.nanopart.visa.api.request.VisaChangePageSearchReq;
 import cn.axzo.nanopart.visa.api.request.VisaChangeTempCreateReq;
 import cn.axzo.nanopart.visa.api.request.VisaDetailByIdRequest;
 import cn.axzo.nanopart.visa.api.request.VisaInitiatorListReq;
+import cn.axzo.nanopart.visa.api.response.VisaChangeDiscussCreateResp;
 import cn.axzo.nanopart.visa.api.response.VisaChangeInitiatorResp;
 import cn.axzo.nanopart.visa.api.response.VisaChangePageSearchResp;
 import cn.axzo.nanopart.visa.api.response.VisaDetailByIdResponse;
 import cn.axzo.nanopart.visa.server.service.ChangeRecordConfirmService;
 import cn.axzo.nanopart.visa.server.service.ChangeRecordService;
-import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,7 +53,7 @@ public class ChangeRecordController implements ChangeRecordApi {
     }
 
     @Override
-    public ApiResult<Long> discussCreateVisaChangeRecord(VisaChangeDiscussCreateReq req) {
+    public ApiResult<VisaChangeDiscussCreateResp> discussCreateVisaChangeRecord(VisaChangeDiscussCreateReq req) {
         return ApiResult.ok(changeRecordService.discussCreateVisaChangeRecord(req));
     }
 
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java
index 0587735c..122994b3 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java
@@ -11,6 +11,7 @@ import cn.axzo.nanopart.visa.api.request.VisaChangeExportReq;
 import cn.axzo.nanopart.visa.api.request.VisaChangePageSearchReq;
 import cn.axzo.nanopart.visa.api.request.VisaChangeTempCreateReq;
 import cn.axzo.nanopart.visa.api.request.VisaInitiatorListReq;
+import cn.axzo.nanopart.visa.api.response.VisaChangeDiscussCreateResp;
 import cn.axzo.nanopart.visa.api.response.VisaChangeInitiatorResp;
 import cn.axzo.nanopart.visa.api.response.VisaChangePageSearchResp;
 import cn.axzo.nanopart.visa.api.response.VisaDetailByIdResponse;
@@ -66,7 +67,7 @@ public interface ChangeRecordService extends IService<ChangeRecord> {
      * @param req 表单数据
      * @return 变更签证Id
      */
-    Long discussCreateVisaChangeRecord(VisaChangeDiscussCreateReq req);
+    VisaChangeDiscussCreateResp discussCreateVisaChangeRecord(VisaChangeDiscussCreateReq req);
 
     /**
      * 创建审批变更签证
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 875d9b55..c570a998 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
@@ -45,6 +45,7 @@ import cn.axzo.nanopart.visa.api.request.VisaChangeExportReq;
 import cn.axzo.nanopart.visa.api.request.VisaChangePageSearchReq;
 import cn.axzo.nanopart.visa.api.request.VisaChangeTempCreateReq;
 import cn.axzo.nanopart.visa.api.request.VisaInitiatorListReq;
+import cn.axzo.nanopart.visa.api.response.VisaChangeDiscussCreateResp;
 import cn.axzo.nanopart.visa.api.response.VisaChangeInitiatorResp;
 import cn.axzo.nanopart.visa.api.response.VisaChangePageSearchResp;
 import cn.axzo.nanopart.visa.api.response.VisaDetailByIdResponse;
@@ -580,7 +581,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Long discussCreateVisaChangeRecord(VisaChangeDiscussCreateReq req) {
+    public VisaChangeDiscussCreateResp discussCreateVisaChangeRecord(VisaChangeDiscussCreateReq req) {
         /*暂存数据*/
         Long visaId = tempCreateVisaChangeRecord(req);
         /*创建群聊*/
@@ -624,7 +625,11 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
                 .ouId(req.getOperatorOuId())
                 .workspaceId(req.getRelationWorkspaceId())
                 .build());
-        return visaId;
+        return VisaChangeDiscussCreateResp.builder()
+                .visaId(visaId)
+                .imGroupId(imGroup.getTid())
+                .imGroupName(req.getTopic())
+                .build();
     }
 
     private void updateImInfo(Long visaId, GroupCreateResponse imGroup) {