[单据] 修改bug

dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java

@@ -16,6 +16,7 @@ import org.xhtmlrenderer.pdf.ITextRenderer;
 
 import java.io.*;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author zjm
@@ -207,7 +208,7 @@ public class JavaToPdfHtmlFreeMarker {
         data.put("receiveUnit",documents.getReceiveUnit());
         data.put("replyNum",documents.getReplyNum());
         data.put("senderUnit",documents.getSenderUnit());
-        data.put("documentDevices",list.stream().map(DocumentDevice::toDocumentDevice));
+        data.put("documentDevices",list.stream().map(DocumentDevice::toDocumentDevice).collect(Collectors.toList()));
         return data;
     }
 
@@ -215,7 +216,7 @@ public class JavaToPdfHtmlFreeMarker {
     private static Map<String,Object> toConfirmMap(Confirm confirm, List<ConfirmDevice> list){
         Map<String,Object> data = new HashMap();
         data.put("title",confirm.getTitle());
-        data.put("documentDevices",list.stream().map(ConfirmDevice::toConfirmDevice));
+        data.put("documentDevices",list.stream().map(ConfirmDevice::toConfirmDevice).collect(Collectors.toList()));
         return data;
     }
 
@@ -225,7 +226,7 @@ public class JavaToPdfHtmlFreeMarker {
         data.put("title",destruction.getTitle());
         data.put("ul",test);
         data.put("unitName",destruction.getDisposeUnitName());
-        data.put("documentDevices",list.stream().map(DestructionDevice::toDestructionDevice));
+        data.put("documentDevices",list.stream().map(DestructionDevice::toDestructionDevice).collect(Collectors.toList()));
         return data;
     }
 

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -200,6 +200,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
                 deviceRepelDetail -> {
                     if (deviceRepelDetail.getBillFile()!=null){
                         deviceRepelDetail.setBillFiles(FilesUtil.stringFileToList(deviceRepelDetail.getBillFile()));
+                        deviceRepelDetail.setDeviceLibraryEntities(deviceLibraryDao.findAllById(StringUtils.stringToList(deviceRepelDetail.getDeviceIds())));
                         list.add(deviceRepelDetail);
                     }
                 }

dev-union/src/main/resources/bill.html

@@ -360,7 +360,7 @@
                                     </span>
                                     <span>
                                         <span class="label">经办人:</span>
-                                        <span class="value">xxxxxx</span>
+                                        <span class="value"></span>
                                     </span>
                                     <span>
                                         <span class="label">经办人:</span>