记得上下班打卡 | git大法好,push需谨慎

Commit a6670c7d authored by 胡佳晨's avatar 胡佳晨

Merge remote-tracking branch 'origin/dev' into dev

parents 7d4d4317 3854da74
...@@ -184,6 +184,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -184,6 +184,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
vo = checkAppStatusInfo(vo); vo = checkAppStatusInfo(vo);
List<KylinTicketTimesVo> ticketTimesList = vo.getTicketTimeList(); List<KylinTicketTimesVo> ticketTimesList = vo.getTicketTimeList();
if (null != ticketTimesList) {
for (KylinTicketTimesVo partner : ticketTimesList) { for (KylinTicketTimesVo partner : ticketTimesList) {
List<KylinTicketVo> ticketList = partner.getTicketList(); List<KylinTicketVo> ticketList = partner.getTicketList();
List<KylinTicketVo> ticketListNew = new ArrayList<>(); List<KylinTicketVo> ticketListNew = new ArrayList<>();
...@@ -203,6 +204,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -203,6 +204,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
} }
partner.setTicketList(ticketListNew); partner.setTicketList(ticketListNew);
} }
}
KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId); KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId);
HashMap<String, Object> info = new HashMap(); HashMap<String, Object> info = new HashMap();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment