|
|
@@ -8,6 +8,7 @@ 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;
|
|
|
@@ -171,9 +172,18 @@ 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());
|
|
|
+ byte driverOneSignUrl[] = null;
|
|
|
+ if (StringUtils.isNotBlank(workLogTplVO.getWorkCycle().getDriverOneSignUrl())) {
|
|
|
+ driverOneSignUrl = getImageBytes(domainUrl + workLogTplVO.getWorkCycle().getDriverOneSignUrl());
|
|
|
+ }
|
|
|
+ byte driverTwoSignUrl[] = null;
|
|
|
+ if (StringUtils.isNotBlank(workLogTplVO.getWorkCycle().getDriverTwoSignUrl())) {
|
|
|
+ driverTwoSignUrl = getImageBytes(domainUrl + workLogTplVO.getWorkCycle().getDriverTwoSignUrl());
|
|
|
+ }
|
|
|
+ byte escortSignUrl[] = null;
|
|
|
+ if (StringUtils.isNotBlank(workLogTplVO.getWorkCycle().getEscortSignUrl())) {
|
|
|
+ escortSignUrl = getImageBytes(domainUrl + workLogTplVO.getWorkCycle().getEscortSignUrl());
|
|
|
+ }
|
|
|
|
|
|
// 获取模板文件
|
|
|
String tplfileName = "work_log_tpl.xlsx";
|