From f8e896d0f47852618a47cd9f3934a30a49f62e5a Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Mon, 5 Aug 2024 10:45:21 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=AE=9E=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docking/feishu/dto/InstanceDto.java       |  3 ++
 .../impl/FeiShuDockingServiceImpl.java        | 30 +++++++++++--------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java
index e5a8cf87..c48e1332 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java
@@ -11,6 +11,9 @@ public class InstanceDto {
     @ApiModelProperty("发起人的id")
     private String promoterUserId;
 
+    @ApiModelProperty("发起人的用户名")
+    private String promoterUseName;
+
     @ApiModelProperty("审核人的ids,可能为多个,逗号分割")
     private String reviewedIds;
 
diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java
index 4147ca59..6be9c1db 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java
@@ -17,7 +17,9 @@ import com.jero.common.util.oConvertUtils;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.service.ProcessApprovalRecordService;
 import com.jero.modules.docking.feishu.common.Constant;
+import com.jero.modules.docking.feishu.controller.FeishuBotService;
 import com.jero.modules.docking.feishu.dto.BotApprovalMessageDto;
+import com.jero.modules.docking.feishu.dto.BotCardMessageDto;
 import com.jero.modules.docking.feishu.dto.BotMessageDto;
 import com.jero.modules.docking.feishu.dto.InstanceDto;
 import com.jero.modules.docking.feishu.service.IFeiShuDockingService;
@@ -299,7 +301,7 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
         return botApprovalMessageDto;
     }
 
-    private ApprovalsInstanceVo buildApprovalsInstanceVo(InstanceDto instanceDto) throws Exception {
+    private ApprovalsInstanceVo buildApprovalsInstanceVo(InstanceDto instanceDto) {
         // 转换userId为飞书Id
         // 发起人的id
         String promoterUserId = instanceDto.getPromoterUserId();
@@ -368,16 +370,16 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
                         }
                     }).collect(Collectors.toList());
         }
-        // 发起人对应的pc的跳转地址
-        String promoterPcLink = URLEncoder.encode(instanceDto.getPromoterPcLink(), "UTF-8");
-        if (StringUtils.isNotBlank(promoterPcLink)) {
-            promoterPcLink = url.replace("{REDIRECT_URI}", promoterPcLink);
-        }
-        // 发起人移动端的跳转地址
-        String promoterMobileLink = URLEncoder.encode(instanceDto.getPromoterMobileLink(), "UTF-8");
-        if (StringUtils.isNotBlank(promoterMobileLink)) {
-            promoterMobileLink = url.replace("{REDIRECT_URI}", promoterMobileLink);
-        }
+//        // 发起人对应的pc的跳转地址
+//        String promoterPcLink = URLEncoder.encode(instanceDto.getPromoterPcLink(), "UTF-8");
+//        if (StringUtils.isNotBlank(promoterPcLink)) {
+//            promoterPcLink = url.replace("{REDIRECT_URI}", promoterPcLink);
+//        }
+//        // 发起人移动端的跳转地址
+//        String promoterMobileLink = URLEncoder.encode(instanceDto.getPromoterMobileLink(), "UTF-8");
+//        if (StringUtils.isNotBlank(promoterMobileLink)) {
+//            promoterMobileLink = url.replace("{REDIRECT_URI}", promoterMobileLink);
+//        }
         // 审批定义的code
         Integer processType = instanceDto.getProcessType();
         // 拿到这个流程的名称
@@ -389,11 +391,12 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
         // 发起人相关的信息
         ApprovalsInstanceVo approvalsInstanceVo = new ApprovalsInstanceVo();
         approvalsInstanceVo.setApproval_code(approvalDefinition);
+        approvalsInstanceVo.setUser_name(instanceDto.getPromoterUseName());
         approvalsInstanceVo.setStatus(instanceDto.getInstanceStatus());
         approvalsInstanceVo.setInstance_id(instanceDto.getProcessInstanceId());
         InstanceLink instanceLink = new InstanceLink();
-        instanceLink.setPc_link(promoterPcLink);
-        instanceLink.setMobile_link(promoterMobileLink);
+        instanceLink.setPc_link(instanceDto.getPromoterPcLink());
+        instanceLink.setMobile_link(instanceDto.getPromoterMobileLink());
         approvalsInstanceVo.setLinks(instanceLink);
         approvalsInstanceVo.setTitle("@i18n@1");
         approvalsInstanceVo.setUser_id(promoterUserId); // 审批发起人的user_id
@@ -777,4 +780,5 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
         HttpEntity<ApprovalsUpdateMessageVo> entity = new HttpEntity<>(approvalsUpdateMessageVo, headers);
         restTemplate.exchange(url, HttpMethod.POST, entity, String.class);
     }
+
 }