app报价编辑报错问题解决

commons/src/main/java/com/jzg/commons/entity/quote/vo/image/InsuranceImageVo.java

@@ -20,6 +20,11 @@ import java.util.List;
 @Accessors(chain = true)
 public class InsuranceImageVo {
 
+    /**
+     * 影像唯一id
+     */
+    private String imageId;
+
     /**
      * 影像类型
      */

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -1028,7 +1028,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         List<InsOrders> insOrders = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
                 .select(InsOrders::getCompanyId)
                 .groupBy(InsOrders::getCompanyId));
-        List<String> companyIds = insOrders.stream().map(InsOrders::getCompanyId).filter(Objects::nonNull).collect(Collectors.toList());
+        List<String> companyIds = insOrders.stream().filter(v -> !Objects.isNull(v) && StringUtils.isNotEmpty(v.getCompanyId())).map(InsOrders::getCompanyId).collect(Collectors.toList());
         String joined = String.join(",", companyIds);
         HttpResult<List<EsmInsCompany>> companyByIds = platformClient.getCompanyByIds(joined,baseController.getToken());
         return companyByIds.getData();

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsTaskImagesServiceImpl.java

@@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.InsTaskImagesAdd;
 import com.jzg.commons.entity.po.InsTaskImages;
+import com.jzg.commons.entity.quote.vo.aggregated.InsuranceUploadImageVo;
 import com.jzg.commons.entity.vo.ImagesVo;
 import com.jzg.commons.entity.vo.InsTaskImagesVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
-import com.jzg.commons.entity.quote.vo.aggregated.InsuranceUploadImageVo;
 import com.jzg.quotation.summary.mapper.InsTaskImagesMapper;
 import com.jzg.quotation.summary.service.InsTaskImagesService;
 import org.springframework.stereotype.Service;
@@ -62,14 +62,20 @@ public class  InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper,
         int delete = baseMapper.delete(new LambdaUpdateWrapper<InsTaskImages>()
                 .eq(InsTaskImages::getQuoteNo, quoteNo));
         insuranceUploadImageVo.getImageVoList().forEach(imageVo -> {
-            imageVo.getImageBase64List().forEach(base64 ->{
-                InsTaskImages insTaskImages = new InsTaskImages();
-                insTaskImages.setId(IdGenerate.nextId());
-                insTaskImages.setQuoteNo(quoteNo);
-                insTaskImages.setImageType(imageVo.getImageCode());
-                insTaskImages.setImageId(base64.getImageId());
-                images.add(insTaskImages);
-            });
+//            imageVo.getImageBase64List().forEach(base64 ->{
+//                InsTaskImages insTaskImages = new InsTaskImages();
+//                insTaskImages.setId(IdGenerate.nextId());
+//                insTaskImages.setQuoteNo(quoteNo);
+//                insTaskImages.setImageType(imageVo.getImageCode());
+//                insTaskImages.setImageId(base64.getImageId());
+//                images.add(insTaskImages);
+//            });
+            InsTaskImages insTaskImages = new InsTaskImages();
+            insTaskImages.setId(IdGenerate.nextId());
+            insTaskImages.setQuoteNo(quoteNo);
+            insTaskImages.setImageType(imageVo.getImageType());
+            insTaskImages.setImageId(imageVo.getImageId());
+            images.add(insTaskImages);
         });
         return !baseMapper.insert(images).isEmpty();
     }