Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/controller/JxlsExportTestController.java

@@ -32,7 +32,7 @@ public class JxlsExportTestController {
     @Resource
     private JxlsExportTestService jxlsExportTestService;
 
-    @ApiOperation(value = "下载行车日志,测试自用")
+    @ApiOperation(value = "下载行车日志,导出专用")
     @PostMapping("/download_test")
     public StreamingResponseBody download(HttpServletResponse response, @RequestBody WorkOrder param) {
         log.info("下载行车日志,导出专用,调用/tms/jxls_export/download_test,参数:{}", JSON.toJSONString(param));

src/main/java/com/aoyang/tms/service/impl/JxlsExportTestServiceImpl.java

@@ -152,7 +152,7 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
         byte escortSignUrl[] = getImageBytes(workLogTplVO.getWorkCycle().getEscortSignUrl());
 
         // 获取模板文件
-        String tplfileName = "circle_sign_tpl.xlsx";
+        String tplfileName = "work_log_tpl.xlsx";
         String tmpFileName = FileUtil.getTmpFileName(FileUtil.getFilePrefix(tplfileName));
         String tmpFilePath = FileUtils.getTempDirectoryPath() + File.separator + tmpFileName;
         // 写文件
@@ -179,7 +179,7 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
             os.close();
         }
         // 导出
-        String newFileName = "circleSign.xlsx";
+        String newFileName = "workLog.xlsx";
         // 输出文件
         response.setHeader("Content-disposition", String.format("attachment; filename=\"%s\"", newFileName));