演出日历时间修改

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/DateUtil.java

@@ -448,7 +448,7 @@ public abstract class DateUtil {
 
     // 获取某月第一天 jiangxiulong
     public static String getMonthFirst(String month) {
-        return month.concat("-01");
+        return month.concat("-01 00:00:00");
     }
 
     // 获取当月最后一天 jiangxiulong
@@ -465,11 +465,15 @@ public abstract class DateUtil {
     }
 
     // 获取某月最后一天 jiangxiulong
-    public static String getMonthLast(String month) throws ParseException {
+    public static String getMonthLast(String month) {
         // String 转 Date
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        Date monthDate = simpleDateFormat.parse(month);
-
+        Date monthDate = null;
+        try {
+            monthDate = simpleDateFormat.parse(month);
+        } catch (Exception e) {
+            return "";
+        }
         //获取Calendar
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(monthDate);

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -259,16 +259,10 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
     public List performanceCalendar(String yearMonth, String cityName) {
         List<KylinPerformanceVo> performancesList = dataUtils.getPerformancesListOfcityName(cityName);
 
-        // 处理成正常格式
-        yearMonth = yearMonth.concat("-01 00:00:00");
         // 获取此月开始结束时间
         String monthStart = DateUtil.getMonthFirst(yearMonth);
         String monthEnd = "";
-        try {
-            monthEnd = DateUtil.getMonthLast(yearMonth);
-        } catch (Exception e) {
-            
-        }
+        monthEnd = DateUtil.getMonthLast(monthStart);
 
         List date = new ArrayList();
         for (KylinPerformanceVo info : performancesList) {