Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Base.java

@@ -291,6 +291,18 @@ public class Base {
     @JacksonXmlProperty(localName = "CBsnsTyp")
     private String CBsnsTyp;
 
+    /**
+     *  意外险保险起期
+     */
+    @JacksonXmlProperty(localName = "TInsrncBgnTmYW ")
+    private String tInsrncBgnTmYW;
+
+    /**
+     *  意外险保险止期
+     */
+    @JacksonXmlProperty(localName = "TInsrncEndTmYW ")
+    private String tInsrncEndTmYW;
+
 
     public static Base buildBase(CustomerInfoVo policyHolderInfo, CustomerInfoVo insuredPersonInfo, List<RiskInfoVo> riskList, YcConfigureParameters ycConfigureParameters) {
 //    public static Base buildBase(YaQuoteInfoVo yaQuoteInfoVo, InsAlltrustRequestApiComponents apiComponents) {

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Ruote.java

@@ -298,12 +298,20 @@ public class Ruote {
             cvrgYW.setCInsuranceCode(adVo.getRideRiskCode());
             cvrgYW.setNInsuranceQuantity(adVo.getQuantity() + "");
             condition.setCvrgYW(cvrgYW);
+
+            base.setAppYWFlag("Y");
+
+            if(base.getAppSYFlag().equals("Y")){
+                base.setTInsrncBgnTmYW(base.getTInsrncBgnTmSY());
+                base.setTInsrncEndTmYW(base.getTInsrncEndTmSY());
+
+            }else{
+                base.setTInsrncBgnTmYW(base.getTInsrncBgnTmJQ());
+                base.setTInsrncEndTmYW(base.getTInsrncEndTmJQ());
+            }
+
         }
 
-//        //@TODO 临时测试
-//        cvrgYW.setCInsuranceCode("100");
-//        cvrgYW.setNInsuranceQuantity("1");
-//        condition.setCvrgYW(cvrgYW);
 
 //        /**
 //         * 意健险被保人信息