Merge branch 'pre' into 'master'

Pre

See merge request !172

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -238,6 +238,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             Map<String, Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam);
             List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map);
             for (PerformanceAdminListDao item : voList) {
+                if (item.getTimeSell() == null || item.getTimeStop() == null) {
+                    continue;
+                }
                 item.setStatus(item.getStatus());
                 if (item.getStatus() >= 6 && item.getStatus() != 7) {
                     if (DateUtil.compareStrDay(item.getTimeSell(), DateUtil.getNowTime()) > 0) {//未开始

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/PerformanceVoTask.java

@@ -336,6 +336,9 @@ public class PerformanceVoTask {
                         tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEndExpress())));
                         tickets.setDescribeExpress(ticketItem.getDescribeExpress());
                     }
+//                    else{
+//                        tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2030-01-01 12:00:00")));
+//                    }
                     if (ticketItem.getIsElectronic() == 1) {
                         tickets.setDescribeElectronic(ticketItem.getDescribeElectronic());
                     }