修改freemaker

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

@@ -359,7 +359,7 @@ public class JavaToPdfHtmlFreeMarker {
 
     private static int toMaxList(List<String> strings){
         Integer count=strings.size();
-        return (count%7>0) ? count/7 + 1 : count/7;
+        return (count%6>0) ? count/6 + 1 : count/6;
     }
 
     private static String seqToString(List<String> strings){
@@ -378,10 +378,10 @@ public class JavaToPdfHtmlFreeMarker {
         int count=toMaxList(strings);
         StringBuilder allStirng= new StringBuilder();
         for (int i=1;i<=count;i++){
-            if (i*7<strings.size()) {
-                allStirng.append(seqToString(strings.subList((i - 1) * 7, i * 7)));
+            if (i*6<strings.size()) {
+                allStirng.append(seqToString(strings.subList((i - 1) * 6, i * 6)));
             }else {
-                allStirng.append(seqToString(strings.subList((i - 1) * 7, strings.size())));
+                allStirng.append(seqToString(strings.subList((i - 1) * 6, strings.size())));
             }
         }
         return allStirng.toString();
@@ -797,12 +797,12 @@ public class JavaToPdfHtmlFreeMarker {
             } else if (i + max > 30) {
                 //当前页面少了多少行
                 int differ = 30 - i;
-                check.setSeqStirng(toALLSeqStirng(stringList.subList(0, (differ-1) * 7)));
+                check.setSeqStirng(toALLSeqStirng(stringList.subList(0, (differ-1) * 6)));
                 check.setOneCount(differ - 1);
                 checkList2.add(check);
                 lists.add(checkList2);
                 checkList2 = new ArrayList<>();
-                List<String> strings = stringList.subList((differ-1) * 7, stringList.size());
+                List<String> strings = stringList.subList((differ-1) * 6, stringList.size());
                 Integer max2 = toMaxList(strings);
 
                 int count = (max2 % 30 > 0) ? max2 / 30 + 1 : max2 / 30;
@@ -810,14 +810,14 @@ public class JavaToPdfHtmlFreeMarker {
                     int o = 1;
                     while (o <= count - 1) {
                         Check check1 = new Check();
-                        check1.setSeqStirng(toALLSeqStirng(strings.subList((o - 1) * 7 * 30, o * 7 * 30)));
+                        check1.setSeqStirng(toALLSeqStirng(strings.subList((o - 1) * 6 * 30, o * 6 * 30)));
                         check1.setOneCount(30);
                         checkList2.add(check1);
                         lists.add(checkList2);
                         checkList2 = new ArrayList<>();
                         o++;
                     }
-                    List<String> endList = strings.subList((count - 1) * 7 * 30, strings.size());
+                    List<String> endList = strings.subList((count - 1) * 6 * 30, strings.size());
                     Integer max4 = toMaxList(endList);
                     int count1 = (max4 % 30 > 0) ? max4 / 30 + 1 : max4 / 30;
                     if (count1 == 30) {