下一步流程

src/main/java/com/fdkankan/sale/common/FilePath.java

@@ -3,6 +3,6 @@ package com.fdkankan.sale.common;
 public class FilePath {
 
     public static String common = "common";
-    public static String file_path = "/home/backend/4dkankan_v4/sale/file/";
+    public static String file_path = "G:/home/backend/4dkankan_v4/sale/file/";
     public static String oss_file_path = "sale/file/%s/%s";
 }

src/main/java/com/fdkankan/sale/controller/RepairInfoController.java

@@ -80,7 +80,7 @@ public class RepairInfoController extends BaseController{
     /**
      * 0 四维时代服务清单（模板）
      * 1 维修服务工作单（模板）
-     *https://v4-uat.4dkankan.com/service/sale/repairInfo/exportExcel?repairId=20230317163855405
+     *http://localhost:8188/service/sale/repairInfo/exportExcel?repairId=20230330120356254
      */
     @GetMapping("/exportExcel")
     public void exportExcel(@RequestParam(required = false) String repairId,

src/main/java/com/fdkankan/sale/service/impl/RepairInfoService.java

@@ -175,7 +175,7 @@ public class RepairInfoService {
     private RepairLogVo getNextStepVo(RepairLogVo repairLogVo) {
         RepairLogVo log = new RepairLogVo();
         log.setRepairId(repairLogVo.getRepairId());
-        log.setRepairStatus( repairLogVo.getRepairStatus() == 91 ? repairLogVo.getRepairStatus() + 9 :repairLogVo.getRepairStatus() + 10 );
+        log.setRepairStatus( repairLogVo.getRepairStatus() );
         if(log.getRepairStatus() >=RepairStatusEnum.OVER_SHIPPED.status()){
             return null;
         }

src/main/java/com/fdkankan/sale/util/MyExcelUtil.java

@@ -93,9 +93,9 @@ public class MyExcelUtil {
             excelWriter.fill(obj2, fillConfig, writeSheet);
         }
         if(excelWriter != null &&exportImg != null){
-            //Map<String, Object> map = BeanUtil.beanToMap(exportImg);
-            //imageHandleByParam(map);
-            excelWriter.fill(exportImg, fillConfig, writeSheet);
+            Map<String, Object> map = BeanUtil.beanToMap(exportImg);
+            imageHandleByParam(map);
+            excelWriter.fill(map, fillConfig, writeSheet);
         }
 
         assert excelWriter != null;
@@ -144,17 +144,13 @@ public class MyExcelUtil {
             try {
                 File file = new File(downloadPath);
                 if(!file.exists()){
-                    fYunFileServiceInterface.downloadFile(ossPath,downloadPath );
+                    fYunFileServiceInterface.downloadFile(ossPath.replaceAll(CacheUtil.host,""),downloadPath );
                 }
                 // 填充图片
                 ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream();
                 BufferedImage bufferImg = ImageIO.read(new File(downloadPath));
                 // 图片后缀格式
-                String suffix = ".png";
-                if(downloadPath.contains(".")){
-                    suffix =  downloadPath.split("\\.")[1];
-                }
-                ImageIO.write(bufferImg, suffix, byteArrayOut);
+                ImageIO.write(bufferImg, "png", byteArrayOut);
 
                 bufferImg.flush();
                 // 注意：这里需要put回原来的key里