|
|
@ -160,6 +160,9 @@ public class TicketMatterGroupServiceImpl extends BaseServiceImpl<TicketMatterGr |
|
|
|
if (CollectionUtil.isNotEmpty(req.getMatterLibraryListOne())) { |
|
|
|
if (CollectionUtil.isNotEmpty(req.getMatterLibraryListOne())) { |
|
|
|
list.addAll(req.getMatterLibraryListOne().stream().map(matterLibrary -> { |
|
|
|
list.addAll(req.getMatterLibraryListOne().stream().map(matterLibrary -> { |
|
|
|
TwoTicketMatterLibraryEntity libraryEntity = BeanUtil.copy(matterLibrary, TwoTicketMatterLibraryEntity.class); |
|
|
|
TwoTicketMatterLibraryEntity libraryEntity = BeanUtil.copy(matterLibrary, TwoTicketMatterLibraryEntity.class); |
|
|
|
|
|
|
|
if ("8" == req.getTicketType()) { |
|
|
|
|
|
|
|
libraryEntity.setType("8"); |
|
|
|
|
|
|
|
} |
|
|
|
libraryEntity.setMatterGroup(groupEntity.getId()); |
|
|
|
libraryEntity.setMatterGroup(groupEntity.getId()); |
|
|
|
return libraryEntity; |
|
|
|
return libraryEntity; |
|
|
|
}).collect(Collectors.toList())); |
|
|
|
}).collect(Collectors.toList())); |
|
|
@ -541,7 +544,7 @@ public class TicketMatterGroupServiceImpl extends BaseServiceImpl<TicketMatterGr |
|
|
|
try { |
|
|
|
try { |
|
|
|
Map<String, Object> map = PdfUtils.objectToMap(library); |
|
|
|
Map<String, Object> map = PdfUtils.objectToMap(library); |
|
|
|
map.put("status", " "); |
|
|
|
map.put("status", " "); |
|
|
|
map.put("index", index[0]); |
|
|
|
map.put("index", index[0]); |
|
|
|
index[0]++; |
|
|
|
index[0]++; |
|
|
|
return map; |
|
|
|
return map; |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|