[pdf]

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/utils/ObjTransUtil.java

@@ -324,6 +324,7 @@ public class ObjTransUtil {
             String[] array = detail.split("-");
             Integer deviceId = Integer.valueOf(array[0]);
             int proofResult = Integer.parseInt(array[1]);
+//            DeviceLibrary device = deviceRepo.findById(deviceId).get().setConfigName();
             DeviceLibrary device = deviceRepo.findById(deviceId).orElseThrow(
                     () -> new ApiException(ResponseEntity.badRequest().body(String.format("检查到装备序号为%d的装备不在资料库中，请先执行入库操作!", deviceId)))).setConfigName();
             //依据proofResult的个位数 判断是否是在库装备

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

@@ -52,8 +52,15 @@ public class DocumentDevice {
     @ApiModelProperty(value = "校对")
     private String proofreading;
 
+    private Integer oneCount;
+
     public Integer getLen(){
         return deviceSerialNumber.length();
     }
 
+    public DocumentDevice toOneCount(){
+        int remainder=deviceSerialNumber.length()%56;
+        this.setOneCount((remainder > 0) ? deviceSerialNumber.length()/56 + 1 :  deviceSerialNumber.length()/56);
+        return this;
+    }
 }

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

@@ -621,12 +621,12 @@ public class JavaToPdfHtmlFreeMarker {
                 while (page<pageCount-1) {
                     if (page==0) {
                         documentDevice.setDeviceSerialNumber(toString(documentDevice.getDeviceSerialNumber().substring(page * 784, (page + 1) * 784)));
-                        list.add(documentDevice);
+                        list.add(documentDevice.toOneCount());
                         lists.add(list);
                     }else {
                         DocumentDevice documentDevice1=new DocumentDevice();
                         documentDevice1.setDeviceSerialNumber(toString(deviceSerialNumber.substring(page * 784, (page + 1) * 784)));
-                        list.add(documentDevice1);
+                        list.add(documentDevice1.toOneCount());
                         lists.add(list);
                     }
                     list = new ArrayList<>();
@@ -634,10 +634,10 @@ public class JavaToPdfHtmlFreeMarker {
                 }
                 DocumentDevice documentDevice1=new DocumentDevice();
                 documentDevice1.setDeviceSerialNumber(toString(deviceSerialNumber.substring((pageCount-1)*784, len)));
-                list.add(documentDevice1);
+                list.add(documentDevice1.toOneCount());
                 count.set(len-(pageCount-1)*784);
             }else if (len==784){
-                list.add(documentDevice);
+                list.add(documentDevice.toOneCount());
                 lists.add(list);
                 list = new ArrayList<>();
             }
@@ -649,15 +649,15 @@ public class JavaToPdfHtmlFreeMarker {
                         DocumentDevice documentDevice1 = new DocumentDevice();
                         documentDevice1.setDeviceSerialNumber(toString(documentDevice.getDeviceSerialNumber().substring(784 - count.get(), len)));
                         documentDevice.setDeviceSerialNumber(toString(documentDevice.getDeviceSerialNumber().substring(0, 784 - count.get())));
-                        list.add(documentDevice);
+                        list.add(documentDevice.toOneCount());
                         lists.add(list);
                         list = new ArrayList<>();
-                        list.add(documentDevice1);
+                        list.add(documentDevice1.toOneCount());
                         int num = documentDevice1.getDeviceSerialNumber().length();
                         int yu = num % 56;
                         count.set(num + yu);
                     }else {
-                        list.add(documentDevice);
+                        list.add(documentDevice.toOneCount());
                         lists.add(list);
                         list = new ArrayList<>();
                         count.set(0);
@@ -665,7 +665,7 @@ public class JavaToPdfHtmlFreeMarker {
                     }
 
                 }else {
-                    list.add(documentDevice);
+                    list.add(documentDevice.toOneCount());
                     int yu=len%56;
                     totle=totle+(56-yu);
                     count.set(totle);