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

src/main/java/com/ydtech/modules/order/entity/InsAreaCompany.java

@@ -505,8 +505,8 @@ public class InsAreaCompany implements Serializable {
         this.totalAdjustRate = quoteRespVo.getTotalAdjustRate();
         this.jqAdjustRate = StringUtils.parseDouble(quoteRespVo.getJqAdjustRate());
         this.syAdjustRate = StringUtils.parseDouble(quoteRespVo.getSyAdjustRate());
-        this.jqRenewal = quoteRespVo.getJqRenewal();
-        this.syRenewal = quoteRespVo.getSyRenewal();
+        this.jqRenewal = StringUtils.isEmpty(quoteRespVo.getJqRenewal()) ? null : quoteRespVo.getJqRenewal();
+        this.syRenewal = StringUtils.isEmpty(quoteRespVo.getSyRenewal()) ? null : quoteRespVo.getSyRenewal();
         this.jqClaims = quoteRespVo.getJqClaims();
         this.syClaims = quoteRespVo.getSyClaims();
 

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -1030,6 +1030,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
      * 转换非车
      */
     public BaseQuoteVo convertDriving(BaseQuoteVo<QuoteAccidentalDrivingVo> baseQuoteVo){
+        if(baseQuoteVo.getCompanyId().equals("HTIC1000000")){
+            return baseQuoteVo;
+        }
+
         if(baseQuoteVo.getAccidentalDrivingVo().getProjectCode() == null){
             baseQuoteVo.setAccidentalDrivingVo(null);
             return baseQuoteVo;
@@ -1145,7 +1149,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
      * @return
      */
     public BaseQuoteVo<List<ZjQuoteAccidentVo>> converDrivingZijin(BaseQuoteVo<List<QuoteAccidentalDrivingVo>> baseQuoteVo){
-        if(baseQuoteVo.getAccidentalDrivingVo().size() == 0){
+        if(baseQuoteVo.getAccidentalDrivingVo().isEmpty()){
             BaseQuoteVo<List<ZjQuoteAccidentVo>> zjBaseQuoteVo = new BaseQuoteVo<>();
             List<ZjQuoteAccidentVo> zjQuoteAccidentVos = new ArrayList<>();
             BeanUtils.copyProperties(baseQuoteVo,zjBaseQuoteVo);

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -554,8 +554,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         PtlAgreementAttributionDto attribution = agreement.getAttribution();
         PtlAgreement ptlAgreement = proxyObject.ifExistsById(agreementId);
         BeanUtils.copyProperties(agreementSaveDto, ptlAgreement);
-
-        EsmInsCompany esmInsCompany = proxyObject.verifyLogin(ptlAgreement, agreementSaveDto, attribution, false);
+        EsmInsCompany esmInsCompany = proxyObject.verifyLogin(ptlAgreement, agreementSaveDto, attribution,
+                "1".equals(ptlAgreement.getValidStatus()));
 
         ptlAgreement.setProductsCode(agreementSaveDto.getProductsCode());
         ptlAgreement.setModifiedBy(userName);