Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_0810

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -391,15 +391,12 @@ public class ExportServiceImpl implements ExportService {
     @Override
     public List exportBill(Map<String, Object> info) {
         String startTimeStr = getParam(info, "startTime", String.class);
-        Date startTime = null;
-        if (StringUtils.isNotEmpty(startTimeStr)) {
-            startTime = DateUtil.stringToDate(startTimeStr, DateUtil.ISO_EXPANDED_DATE_FORMAT);
-        }
-        Date endTime = null;
         String endTimeStr = getParam(info, "endTime", String.class);
-        if (StringUtils.isNotEmpty(endTimeStr)) {
-            endTime = DateUtil.stringToDate(endTimeStr, DateUtil.ISO_EXPANDED_DATE_FORMAT);
+        if(StringUtils.isEmpty(startTimeStr) || StringUtils.isEmpty(endTimeStr)){
+            throw new BizException("请选择时间节点");
         }
+        Date startTime = DateUtil.stringToDate(startTimeStr, DateUtil.ISO_EXPANDED_DATE_FORMAT);
+        Date endTime = DateUtil.stringToDate(endTimeStr, DateUtil.ISO_EXPANDED_DATE_FORMAT);
         long createdGte = startTime.getTime();
         long createdLte = DateUtil.getLastSecondWithDay(endTime).getTime();
         int pageIndex = 1;