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

Commit 51515d5d authored by wangyifan's avatar wangyifan

Merge branch 'dev-wyf-1.5' into container-test

parents a409a2c8 49cef9f3
......@@ -46,6 +46,7 @@ import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
......@@ -276,8 +277,11 @@ public class KylinPerformancesController extends BaseController {
List<TicketTimesTicketCreatePartnerVo> ticketTimes = performance.getTicketTimes();
String ticketTimesJson = "[]";
if (ticketTimes != null && !ticketTimes.isEmpty()) {
List<TicketTimesTicketCreatePartnerVo> collect = ticketTimes.stream()
.filter(f -> f.getType().equals(1))
.collect(Collectors.toList());
com.fasterxml.jackson.databind.ObjectMapper mapper = new com.fasterxml.jackson.databind.ObjectMapper();
ticketTimesJson = mapper.writeValueAsString(ticketTimes);
ticketTimesJson = mapper.writeValueAsString(collect);
}
mmap.put("performancesId", performancesId);
......
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