Merge branch 'dev/one' of http://192.168.2.153:81/diagbotcloud.git into dev/one

diagbotman-service/src/main/java/com/diagbot/facade/ProductOrderFacade.java

@@ -114,12 +114,12 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
         for (int i =0; i<addOrderVO.getProductId().size();i++){
             for (int j =0; j<opendId.size();j++){
                 if(addOrderVO.getProductId().get(i)==opendId.get(j)){
-                    throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请勿重复提交已开通产品:");
+                    throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请勿重复提交已开通产品");
                 }
             }
             for (int k =0; k<orderDetailsId.size();k++){
                 if(addOrderVO.getProductId().get(i)==orderDetailsId.get(k)){
-                    throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "产品正在审核中请勿重复提交:");
+                    throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "产品正在审核中请勿重复提交");
                 }
             }
         }
@@ -147,7 +147,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
             list.add(orderDetails);
         }
         if (0 == lantoneProductFacade.listByIds(lantoneProductId).size()) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取产品信息失败:");
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取产品信息失败");
         }
         /*if(orderDetailsFacade.saveOrderDetails(list)){
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "添加订单失败");
@@ -267,6 +267,10 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
     public void export(ProductOrderExportVO productOrderExportVO,HttpServletResponse response){
 	    ProductOrderVO productOrderVO =new ProductOrderVO();
 	    BeanUtil.copyProperties(productOrderExportVO,productOrderVO);
+	    if(DateUtil.getDaysBetweenTwoDate(DateUtil.parseDate(productOrderVO.getStartTime()), DateUtil.parseDate(productOrderVO.getEndTime()))>30 || DateUtil.getDaysBetweenTwoDate(DateUtil.parseDate(productOrderVO.getStartTime()), DateUtil.parseDate(productOrderVO.getEndTime())) < 0){
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "日期超出限制，请重新输入");
+        }
 	    productOrderVO.setCurrent(1L);
         productOrderVO.setSize(999999999999999999L);
         Map<String, Object> userMap = new HashMap<String, Object>();