|
@@ -338,7 +338,7 @@ public class SwCollectionNoticeServiceImpl implements SwCollectionNoticeService
|
|
|
}
|
|
|
List<SwBusinesshallDo> list = swBusinesshallService.list(new LambdaQueryWrapper<SwBusinesshallDo>().eq(BaseDo::getDeleted, "0")
|
|
|
.orderByAsc(SwBusinesshallDo::getOrdernumber));
|
|
|
- String addresStr = list.stream().map(data -> data.getAddress()+"("+data.getWorktime()+")").collect(Collectors.joining("\n"));
|
|
|
+ String addresStr = list.stream().map(data -> data.getAddress()+" ("+data.getWorktime()+")").collect(Collectors.joining("\n"));
|
|
|
|
|
|
ClassPathResource classPathResource = new ClassPathResource("temp/" + tempName);
|
|
|
try (InputStream templateStream = classPathResource.getInputStream()) {
|