[doc] 文件模块代码提交

dev-file/src/main/java/com/tykj/dev/device/file/entity/Documents.java

@@ -40,7 +40,13 @@ public class Documents {
     @ApiModelProperty(name = "发件方经办人")
     private String nameA;
 
+    @ApiModelProperty(name = "发件方经办人")
+    private String nameA1;
+
     @ApiModelProperty(name = "接收方人员")
     private String nameB;
 
+    @ApiModelProperty(name = "接收方人员")
+    private String nameB1;
+
 }

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

@@ -196,18 +196,18 @@ public class JavaToPdfHtmlFreeMarker {
         data.put("count",count);
         if (documents.getSrcA()==null||documents.getSrcA().equals("")){
             data.put("srcA","\""+1+"\"");
-            data.put("nameA"," ");
         }else {
             data.put("srcA","\""+documents.getSrcA()+"\"");
-            data.put("nameA",documents.getNameA());
         }
+        data.put("nameA",documents.getNameA());
+        data.put("nameA1",documents.getNameA1());
+        data.put("nameB",documents.getNameB());
+        data.put("nameB1",documents.getNameB1());
 
         if (documents.getSrcB()==null||documents.getSrcB().equals("")){
             data.put("srcB","\""+1+"\"");
-            data.put("nameB"," ");
         }else {
             data.put("srcB","\""+documents.getSrcB()+"\"");
-            data.put("nameB",documents.getNameB());
         }
         List<DocumentDevice> list1=new ArrayList<>();
         AtomicInteger i= new AtomicInteger(1);

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

@@ -340,11 +340,11 @@
                                     </span>
                                     <span>
                                         <span class="label">签发人:</span>
-                                        <span class="value"></span>
+                                        <span class="value">${nameA1!}</span>
                                     </span>
                                     <span>
                                         <span class="label">经办人:</span>
-                                        <span class="value">${nameA}</span>
+                                        <span class="value">${nameA!}</span>
                                     </span>
                                     <i>
                                         <span style="position: relative;color: #646464">
@@ -365,11 +365,11 @@
                                     </span>
                                     <span>
                                         <span class="label">经办人:</span>
-                                        <span class="value">${nameB}</span>
+                                        <span class="value">${nameB!}</span>
                                     </span>
                                     <span>
                                         <span class="label">经办人:</span>
-                                        <span class="value"></span>
+                                        <span class="value">${nameB1!}</span>
                                     </span>
                                     <i>
                                         <span style="color: #646464">