chengang 4 anni fa
parent
commit
7b63a48393

+ 6 - 13
src/main/java/com/aoyang/tms/service/impl/JxlsExportTestServiceImpl.java

@@ -8,7 +8,6 @@ import com.aoyang.tms.util.DateUtils;
 import com.aoyang.tms.util.FileUtil;
 import com.aoyang.tms.util.JxlsUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.BeanUtils;
@@ -172,6 +171,9 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
             log.info("workLogTplVO is null:{}");
             return null;
         }
+        byte driverOneSignUrl[] = getImageBytes(domainUrl + workLogTplVO.getWorkCycle().getDriverOneSignUrl());
+        byte driverTwoSignUrl[] = getImageBytes(domainUrl + workLogTplVO.getWorkCycle().getDriverTwoSignUrl());
+        byte escortSignUrl[] = getImageBytes(domainUrl + workLogTplVO.getWorkCycle().getEscortSignUrl());
 
         // 获取模板文件
         String tplfileName = "work_log_tpl.xlsx";
@@ -215,18 +217,9 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
             model.put("restInfoList", workLogTplVO.getRestInfoList());
             model.put("truckCheckInfoList", workLogTplVO.getTruckCheckInfoList());
 
-            if(StringUtils.isNotBlank(workLogTplVO.getWorkCycle().getDriverOneSignUrl())){
-                byte driverOneSignUrl[] = getImageBytes(domainUrl + workLogTplVO.getWorkCycle().getDriverOneSignUrl());
-                model.put("driverOneSignUrl", driverOneSignUrl);
-            }
-            if(StringUtils.isNotBlank(workLogTplVO.getWorkCycle().getDriverTwoSignUrl())){
-                byte driverTwoSignUrl[] = getImageBytes(domainUrl + workLogTplVO.getWorkCycle().getDriverTwoSignUrl());
-                model.put("driverTwoSignUrl", driverTwoSignUrl);
-            }
-            if(StringUtils.isNotBlank(workLogTplVO.getWorkCycle().getEscortSignUrl())){
-                byte escortSignUrl[] = getImageBytes(domainUrl + workLogTplVO.getWorkCycle().getEscortSignUrl());
-                model.put("escortSignUrl", escortSignUrl);
-            }
+            model.put("driverOneSignUrl", driverOneSignUrl);
+            model.put("driverTwoSignUrl", driverTwoSignUrl);
+            model.put("escortSignUrl", escortSignUrl);
 
             JxlsUtils.exportExcel(inputStream, os, model);
             os.close();