|
|
@@ -2,19 +2,13 @@ package org.springblade.evisa.service.impl;
|
|
|
|
|
|
|
|
|
import cfca.paperless.base.util.Base64;
|
|
|
-
|
|
|
-
|
|
|
import cn.hutool.core.io.file.FileReader;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.apache.commons.io.IOUtils;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
-import org.springblade.business.entity.ArchiveFile;
|
|
|
-import org.springblade.business.entity.ContractLog;
|
|
|
import org.springblade.business.entity.InformationQuery;
|
|
|
import org.springblade.business.entity.TrialSelfInspectionRecord;
|
|
|
import org.springblade.business.feign.TaskClient;
|
|
|
-import org.springblade.business.vo.TaskApprovalVO;
|
|
|
import org.springblade.business.vo.TaskSignInfoVO;
|
|
|
import org.springblade.business.vo.TrialRawMaterialSelfRecord;
|
|
|
import org.springblade.common.constant.CommonConstant;
|
|
|
@@ -32,7 +26,8 @@ import org.springblade.evisa.service.EVisaService;
|
|
|
import org.springblade.evisa.utils.FileUtils;
|
|
|
import org.springblade.evisa.utils.PDFUtils;
|
|
|
import org.springblade.evisa.utils.SignFtpUtil;
|
|
|
-import org.springblade.evisa.vo.*;
|
|
|
+import org.springblade.evisa.vo.SealPdfVO;
|
|
|
+import org.springblade.evisa.vo.SealStrategyVO;
|
|
|
import org.springblade.manager.entity.ProjectInfo;
|
|
|
import org.springblade.manager.feign.ProjectClient;
|
|
|
import org.springblade.resource.feign.NewIOSSClient;
|
|
|
@@ -44,8 +39,14 @@ import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import java.io.*;
|
|
|
-import java.util.*;
|
|
|
+import java.io.ByteArrayInputStream;
|
|
|
+import java.io.File;
|
|
|
+import java.io.FileOutputStream;
|
|
|
+import java.io.InputStream;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
|
@@ -320,7 +321,7 @@ public class EVDataServiceImpl implements EVDataService {
|
|
|
} else if ("2".equals(type)) {
|
|
|
if (StringUtils.isNotEmpty(eVisaPdfUrl) || StringUtils.isNotEmpty(pdfUrl)) {
|
|
|
//试验原始pdf
|
|
|
- String approvalPdf = StringUtils.isNotEmpty(eVisaPdfUrl) ? eVisaPdfUrl : pdfUrl;
|
|
|
+ String approvalPdf = eVisaPdfUrl.length() >= 10 ? eVisaPdfUrl : pdfUrl;
|
|
|
taskApp.setSignPdfUrl(getHppsToHttp(approvalPdf));
|
|
|
|
|
|
//试验关联的原材料检测报告合并pdf （wbsId=试验记录id）TrialSelfInspectionRecord
|
DengLinLang