Jelajahi Sumber

平安上传文件修改bug

hxl13994548489 2 tahun lalu
induk
melakukan
a5eddc90ea

+ 15 - 7
src/main/java/com/ydtech/modules/order/service/impl/PingAnOrderApiServiceImpl.java

@@ -10,6 +10,7 @@ import com.ydtech.modules.ins.model.pingan.respose.PingAnQuoteRespVo;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.components.pingan.PinganRequestApiComponents;
+import com.ydtech.modules.order.dao.InsTaskImagesMapper;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsDrivingIntentionInsuranceSon;
 import com.ydtech.modules.order.entity.InsOrders;
@@ -31,6 +32,7 @@ import com.ydtech.modules.order.entity.api.zijin.request.SubmitVerifyRequest;
 import com.ydtech.modules.order.entity.api.zijin.response.QueryClauseDataResponse;
 import com.ydtech.modules.order.entity.config.PingAnConfigureParameters;
 import com.ydtech.modules.order.entity.crawler.vo.CrawlerPolicyPrintVo;
+import com.ydtech.modules.order.entity.dto.InsUploadImagesDto;
 import com.ydtech.modules.order.entity.po.InsTaskImages;
 import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
 import com.ydtech.modules.order.entity.po.InsUploadFiles;
@@ -87,6 +89,8 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
 
     private final PinganApiLogService   pinganApiLogService;
 
+    private final InsTaskImagesMapper insTaskImagesMapper;
+
 
     /**
      * @Description 获取财意险险种套餐列表  调用 4.4
@@ -448,9 +452,13 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                 ptlAgreementAttribution);
         PinganApiLog pinganApiLog = new PinganApiLog(insAreaCompany.getOrderno(),subOrderNo,insAreaCompany.getAgreementId());
         InsOrders insOrders = insOrdersService.existOrder(insAreaCompany.getOrderno());
-        List<InsTaskImagesBase64> insTaskImagesBase64s = insTaskImagesService.findByOrderNo(insOrders.getOrderno(),
-                insAreaCompany.getId(), true);
-        if (insTaskImagesBase64s.isEmpty()) {
+
+        //图片
+        List<InsUploadImagesDto> imgList = insTaskImagesMapper.getByOrderNoInsUploadImagesDtoList(insAreaCompany.getOrderno());
+
+       // List<InsTaskImagesBase64> insTaskImagesBase64s = insTaskImagesService.findByOrderNo(insOrders.getOrderno(),
+       //         insAreaCompany.getId(), true);
+        if (imgList.isEmpty()) {
             return HttpResult.error("影像集合为空");
         } else {
             List<InsTaskImages> listNew = new ArrayList<InsTaskImages>();
@@ -460,14 +468,14 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
             // 获取上级目录
             String parentPath = projectFile.getParent();
             List<InsTaskImages> insTaskImages =new ArrayList<>();
-            for (InsTaskImagesBase64 insTaskImagesBase64 : insTaskImagesBase64s) {
-                InsUploadFiles fiels = insUploadFilesService.getById(insTaskImagesBase64.getImageId());
-                InsTaskImages imagevo = insTaskImagesService.getById(insTaskImagesBase64.getId());
+            for (InsUploadImagesDto insUploadImagesDto : imgList) {
+                InsUploadFiles fiels = insUploadFilesService.getById(insUploadImagesDto.getImageId());
+                InsTaskImages imagevo = insTaskImagesService.getById(insUploadImagesDto.getId());
                 String key=parameters.getUserId()+"-"+new SimpleDateFormat("yyyyMMddhhmmss").format(new Date())+"-"+UUID.randomUUID();
                 File file =new File( parentPath+ fiels.getFilePath());
                 imagevo.setPinganKey(key);
                 insTaskImages.add(imagevo);
-                PingAnDocumentClassEnum fileEnum = PingAnDocumentClassEnum.getCode(insTaskImagesBase64.getImageType());
+                PingAnDocumentClassEnum fileEnum = PingAnDocumentClassEnum.getCode(insUploadImagesDto.getImageType());
                 String documentClass=fileEnum.getDocument();
                 String documentType=fileEnum.getDocumentType();
                 String fileName = file.getName();