4.21bug优化

cloud-web-manage/src/main/java/com/yizhi/application/enroll/controller/EnrollManageController.java

 package com.yizhi.application.enroll.controller;
 package com.yizhi.application.enroll.controller;
 
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.*;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
@@ -14,6 +15,7 @@ import com.yizhi.system.application.system.remote.AccountClient;
 import com.yizhi.system.application.system.remote.OrganizationClient;
 import com.yizhi.system.application.system.remote.OrganizationClient;
 import com.yizhi.system.application.vo.AccountVO;
 import com.yizhi.system.application.vo.AccountVO;
 import com.yizhi.training.application.feign.TrainingProjectClient;
 import com.yizhi.training.application.feign.TrainingProjectClient;
+import com.yizhi.training.application.vo.domain.TrainingProjectVo;
 import com.yizhi.util.application.constant.ReturnCode;
 import com.yizhi.util.application.constant.ReturnCode;
 import com.yizhi.util.application.domain.BizResponse;
 import com.yizhi.util.application.domain.BizResponse;
 import com.yizhi.util.application.domain.Response;
 import com.yizhi.util.application.domain.Response;
@@ -21,6 +23,7 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -64,6 +67,9 @@ public class EnrollManageController {
     @Autowired
     @Autowired
     private EnrollerListExport enrollerListExport;
     private EnrollerListExport enrollerListExport;
 
 
+    @Value("${pc.host.url}")
+    String pcHostUrl;
+
     @ApiOperation(value = "新增报名信息", notes = "新增报名信息")
     @ApiOperation(value = "新增报名信息", notes = "新增报名信息")
     @PostMapping("/insert")
     @PostMapping("/insert")
     @ApiImplicitParams({@ApiImplicitParam(name = "trainingProjectId", value = "培训项目ID"),
     @ApiImplicitParams({@ApiImplicitParam(name = "trainingProjectId", value = "培训项目ID"),
@@ -356,17 +362,23 @@ public class EnrollManageController {
 
 
         Map<String, Object> paramMap = new HashMap<String, Object>();
         Map<String, Object> paramMap = new HashMap<String, Object>();
 
 
+        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyyMMddHHmmss");
+        Date comitTime = new Date();
         paramMap.put("taskId", taskId);
         paramMap.put("taskId", taskId);
         paramMap.put("serialNo", serialNo);
         paramMap.put("serialNo", serialNo);
         paramMap.put("taskName", taskName);
         paramMap.put("taskName", taskName);
+        paramMap.put("comitTime", comitTime);
         paramMap.put("res", res);
         paramMap.put("res", res);
         paramMap.put("userName", userName);
         paramMap.put("userName", userName);
         paramMap.put("key", key);
         paramMap.put("key", key);
         paramMap.put("trainningProjectId", trainningProjectId);
         paramMap.put("trainningProjectId", trainningProjectId);
         paramMap.put("state", state);
         paramMap.put("state", state);
         enrollerListExport.execute(paramMap, true);
         enrollerListExport.execute(paramMap, true);
+        TrainingProjectVo trainingProject = trainingProjectClient.getOne(trainningProjectId);
+        String fileName = trainingProject.getName() + "报名明细" + sdf2.format(comitTime) + ".xlsx";
+        String fileUril = pcHostUrl+"/api/v1/buckets/upload/objects/download/?preview=true&prefix="+fileName;
 
 
-        return Response.ok("导出成功," + " " + "编号:" + serialNo);
+        return Response.ok(fileUril);
     }
     }
 
 
     @ApiOperation(value = "更新报名状态", notes = "更新报名状态")
     @ApiOperation(value = "更新报名状态", notes = "更新报名状态")

cloud-web-manage/src/main/java/com/yizhi/application/enroll/controller/EnrollerListExport.java

@@ -61,7 +61,7 @@ public class EnrollerListExport extends AbstractDefaultTask<String, Map<String,
         Long accountId1 = res.getAccountId();
         Long accountId1 = res.getAccountId();
         Long siteId = res.getSiteId();
         Long siteId = res.getSiteId();
         Long companyId = res.getCompanyId();
         Long companyId = res.getCompanyId();
-        Date comitTime = new Date();
+        Date comitTime = (Date) map.get("comitTime");;
         Long taskId = (Long) map.get("taskId");
         Long taskId = (Long) map.get("taskId");
         String serialNo = (String) map.get("serialNo");
         String serialNo = (String) map.get("serialNo");
         String taskName = (String) map.get("taskName");
         String taskName = (String) map.get("taskName");
@@ -249,6 +249,7 @@ public class EnrollerListExport extends AbstractDefaultTask<String, Map<String,
             if (!fileDir.exists()) {
             if (!fileDir.exists()) {
                 fileDir.mkdir();
                 fileDir.mkdir();
             }
             }
+            map.put("fileName",fileName);
             String path = requestPath + "/" + fileName;
             String path = requestPath + "/" + fileName;
             FileOutputStream os = null;
             FileOutputStream os = null;
             File file = null;
             File file = null;