Merge branch 'test-cyr' of sxzgd/java-insagent-pc into test

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

@@ -1394,7 +1394,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 StringUtils.isEmpty(orderExpirationQueryVo.getJqEndDate()))) {
             throw new InvalidPropertyException(getClass(),"jqStartDate/jqEndDate","请输入交强查询起止日期！");
 
-        } else {
+        }
+
+        if (!orderExpirationQueryVo.getJqEnable()){
             orderExpirationQueryVo.setJqStartDate(currentTime.format(datePat) );
             orderExpirationQueryVo.setJqEndDate(oneYearAgo.format(datePat) );
         }
@@ -1402,7 +1404,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if (orderExpirationQueryVo.getSyEnable() &&(StringUtils.isEmpty(orderExpirationQueryVo.getSyStartDate()) ||
                 StringUtils.isEmpty(orderExpirationQueryVo.getSyEndDate() ))) {
             throw new InvalidPropertyException(getClass(),"syStartDate/syEndDate","请输入商业查询起止日期！");
-        } else {
+        }
+        if (!orderExpirationQueryVo.getSyEnable()){
             orderExpirationQueryVo.setSyStartDate(currentTime.format(datePat));
             orderExpirationQueryVo.setSyEndDate(oneYearAgo.format(datePat)  );
         }