Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/build/HuaTaiCrawlerQuoteResultsVoBuild.java

@@ -30,8 +30,14 @@ public class HuaTaiCrawlerQuoteResultsVoBuild {
         quoteResultsVo.setOrdersNo(orderBase.getOrdersNo());
         // 交强险
         quoteResultsVo.setCiRiskInfoVo(buildCiRiskInfoVo(quoteResponseData, quoteVo));
+        quoteResultsVo.setCiStartDate(quoteResultsVo.getCiRiskInfoVo().getStartDate());
+        quoteResultsVo.setCiEndDate(quoteResultsVo.getCiRiskInfoVo().getEndDate());
         // 商业险
         quoteResultsVo.setBiRiskInfoVo(buildBiRiskInfoVo(quoteResponseData, quoteVo));
+        if(quoteResultsVo.getBiRiskInfoVo() != null) {
+            quoteResultsVo.setBiStartDate(quoteResultsVo.getBiRiskInfoVo().getStartDate());
+            quoteResultsVo.setBiEndDate(quoteResultsVo.getBiRiskInfoVo().getEndDate());
+        }
         // 商业险种的详细保费
         quoteResultsVo.setKindInfoVo(quoteVo.getKindInfoVo());
         // 商业险险种信息

tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/entity/request/AuditRequest.java

@@ -384,6 +384,10 @@ public class AuditRequest {
                 condition.setSyFlag("1");
             }
         });
+        //设置驾意险标志
+        if(underwritingVo.getInsOrdersAccidentalDriving() != null){
+            condition.setYwFlag("1");
+        }
         condition.setCProdNoSY(condition.getSyFlag().equals("1") ? "0364" : "");
         condition.setCProdNoJQ(condition.getJqFlag().equals("1") ? "0326" : "");
         condition.setQuerySequenceNoSy(underwritingVo.getPolicy().getSyApplyNo());
@@ -399,6 +403,7 @@ public class AuditRequest {
         condition.setCPintubeLicenceNo("110");
         condition.setCPintubeTel("110");
         condition.setMaintenanceStaffCode("110");
+        condition.setYwFlag("1");
         //<condition>
 
         Condition.Customer customer = new Condition.Customer();
@@ -463,7 +468,6 @@ public class AuditRequest {
         r.setAuthorityData(configurationProperties.gainAuthorityDataXml());
         r.setCondition(condition);
 
-
         auditRequest.setRequestLabel(r);