Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/DESExportService.java

@@ -6,6 +6,7 @@
  */
 package com.netease.mail.yanxuan.change.biz.service;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -23,6 +24,7 @@ import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowRequest;
  * @Date 2022/12/8
  */
 @Component
+@Slf4j
 public class DESExportService {
 
     @Autowired
@@ -43,6 +45,8 @@ public class DESExportService {
         callbackQueryParam.setCallbackBeanName("changeFlowExportCallback");
         callbackQueryParam.setLimit(appConfig.getExportLimit());
         taskReq.setCallbackQueryParam(callbackQueryParam);
-        return desClient.addTask(taskReq);
+        String desResult = desClient.addTask(taskReq);
+        log.info("create task result: {}", desResult);
+        return desResult;
     }
 }
\ No newline at end of file

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeFlowController.java

@@ -181,7 +181,7 @@ public class ChangeFlowController {
      * @return
      */
     @GetMapping("/export")
-    public AjaxResult<Void> export(@RequestParam(name = "itemId", required = false) String itemId,
+    public AjaxResult<String> export(@RequestParam(name = "itemId", required = false) String itemId,
                                     @RequestParam(name = "supplier", required = false) String supplier,
                                     @RequestParam(name = "parentChangeClassId", required = false) Long parentChangeClassId,
                                     @RequestParam(name = "sonChangeClassId", required = false) Long sonChangeClassId,
@@ -212,14 +212,13 @@ public class ChangeFlowController {
         if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) {
             Assert.isTrue(Strings.isNotBlank(supplier), "同舟端查询供应商id不可为空");
         }
-        this.exportAddressBook(changeFlowRequest);
-        return AjaxResult.success();
+        String s = this.exportAddressBook(changeFlowRequest);
+        return AjaxResult.success(s);
     }
 
-    public AjaxResult exportAddressBook(ChangeFlowRequest req) {
+    public String exportAddressBook(ChangeFlowRequest req) {
         req.setUid(RequestLocalBean.getUid());
-        String data = desExportService.changeFlowExport(req);
-        return AjaxResult.success(data);
+        return desExportService.changeFlowExport(req);
     }
 
     /**