|
@@ -48,7 +48,7 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
|
|
|
@Resource
|
|
@Resource
|
|
|
private TruckCheckInfoService truckCheckInfoService;
|
|
private TruckCheckInfoService truckCheckInfoService;
|
|
|
@Value("${domain_url}")
|
|
@Value("${domain_url}")
|
|
|
- private static String domainUrl;
|
|
|
|
|
|
|
+ private String domainUrl;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public WorkLogTplVO getWorkLogTplVO(WorkOrder param) {
|
|
public WorkLogTplVO getWorkLogTplVO(WorkOrder param) {
|
|
@@ -268,9 +268,6 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
|
|
|
|
|
|
|
|
//获取图片的字节码,临时使用
|
|
//获取图片的字节码,临时使用
|
|
|
private static byte[] getImageBytes(String imagePath) throws IOException {
|
|
private static byte[] getImageBytes(String imagePath) throws IOException {
|
|
|
- if(imagePath.equals(domainUrl)){
|
|
|
|
|
- return null;
|
|
|
|
|
- }
|
|
|
|
|
byte imageBytes[] = null;
|
|
byte imageBytes[] = null;
|
|
|
InputStream is = getInputStreamFromHttp(imagePath);
|
|
InputStream is = getInputStreamFromHttp(imagePath);
|
|
|
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
|
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|