Merge branch 'tz'

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/QuoteEchoVo.java

@@ -80,6 +80,12 @@ public class QuoteEchoVo extends QuoteVo {
 
         //车辆信息处理
         this.setCarInfoVo(insOrdersVo.getCarInfoVo());
+        insOrdersVo.getCarInfoVo().setRegisterDate(insOrdersVo.getCarInfoVo().getRegisterDate().substring(0,insOrdersVo.getCarInfoVo().getRegisterDate().indexOf(" ")));
+        insOrdersVo.getCarInfoVo().setIssueDate(insOrdersVo.getCarInfoVo().getIssueDate().substring(0,insOrdersVo.getCarInfoVo().getIssueDate().indexOf(" ")));
+        if(Objects.nonNull(insOrdersVo.getCarInfoVo().getTransferDate())) {
+            insOrdersVo.getCarInfoVo().setTransferDate(insOrdersVo.getCarInfoVo().getTransferDate().substring(0, insOrdersVo.getCarInfoVo().getTransferDate().indexOf(" ")));
+        }
+
 
         //人员处理
         this.setOwnersInfo(insOrdersVo.getOwnersInfo());
@@ -132,6 +138,7 @@ public class QuoteEchoVo extends QuoteVo {
         ptlAgreementInsCompanyVo.setLogo(esmInsCompany.getLogo());
         ptlAgreementInsCompanyVo.setCompanyCode(esmInsCompany.getCompanyCode());
         ptlAgreementInsCompanyVo.setNameSimple(esmInsCompany.getNameSimple());
+        ptlAgreementInsCompanyVo.setCnName(esmInsCompany.getCode());
         this.insCompanyVo.add(ptlAgreementInsCompanyVo);
 
     }

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/QuoteResultsVo.java

@@ -100,12 +100,12 @@ public class QuoteResultsVo implements Serializable {
     private ScoreVo scoreVo = new ScoreVo();
 
     /**
-     * 交强出现次数
+     * 交强出险次数
      */
     private String ciClaims;
 
     /**
-     * 商业出现次数
+     * 商业出险次数
      */
     private String biClaims;
 

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

@@ -394,7 +394,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
      * 将 InsOrdersCarUserInfo 转换为 CustomerInfoVo
      */
     private CustomerInfoVo mapCarUserInfoToCustomerInfo(InsOrdersCarUserInfo carUserInfo) {
-        return BeanUtil.copyProperties(carUserInfo, CustomerInfoVo.class);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        CustomerInfoVo customerInfoVo = BeanUtil.copyProperties(carUserInfo, CustomerInfoVo.class);
+        customerInfoVo.setIdentifyValidDate(carUserInfo.getIdentifyValidDate().format(formatter));
+        customerInfoVo.setIdentifyValidEndDate(carUserInfo.getIdentifyValidEndDate().format(formatter));
+        customerInfoVo.setProperty(customerInfoVo.getPersonType());
+        return customerInfoVo;
     }
 
     /**
@@ -407,6 +412,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         switch (policyPersonType) {
             case 1:
                 insOrdersVo.setOwnersInfo(customerInfoVo);
+                insOrdersVo.getOwnersInfo().setIdentifyValidDate(customerInfoVo.getIdentifyValidDate());
                 break;
             case 2:
                 insOrdersVo.setPolicyHolderInfo(customerInfoVo);

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -320,6 +320,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         companyList.forEach(company->{
             PtlAgreementInsCompanyVo vo = new PtlAgreementInsCompanyVo();
             BeanUtil.copyProperties(company,vo);
+            vo.setCnName(vo.getCode());
             vo.setLogo(MinioUtils.getPresignedObjectUrl(bucketName,company.getLogo()));
             resVo.add(vo);