lyhzzz 2 年之前
父節點
當前提交
87b3eecb69

+ 1 - 1
src/main/java/com/fdkankan/sale/httpClient/request/OaData.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 @Data
 public class OaData {
-    private String  mailUrl;
+    private String  redirectUrl;
     private String  repairId;
     private String  repairCreateTime;
     private String  cameraTypeStr;

+ 3 - 2
src/main/java/com/fdkankan/sale/service/impl/DingService.java

@@ -23,6 +23,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -133,8 +134,8 @@ public class DingService {
             if(StringUtils.isBlank(fileContent)){
                 throw new BusinessException(ResultCode.DING_SEND_ERROR);
             }
-
-            fileContent = fileContent.replaceAll("\\{mailUrl}",oaData.getMailUrl());
+            String redirectUrl = CacheUtil.mainUrl + "aftermarketmp/#/work/detail/"+ repairLog.getRepairId();
+            fileContent = fileContent.replaceAll("\\{redirectUrl}", URLEncoder.encode(redirectUrl));
             fileContent = fileContent.replaceAll("\\{repairId}",oaData.getRepairId());
             fileContent = fileContent.replaceAll("\\{repairCreateTime}",oaData.getRepairStatusStr());
             fileContent = fileContent.replaceAll("\\{cameraTypeStr}",oaData.getCameraTypeStr());

+ 2 - 0
src/main/java/com/fdkankan/sale/service/impl/RepairTesterService.java

@@ -1,4 +1,6 @@
 package com.fdkankan.sale.service.impl;
+import java.net.URL;
+import java.net.URLEncoder;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;