提交 e7c5ddaf authored 作者: 133's avatar 133

fix(PDF模块): 修改了不自动补充空的表单

修改了不自动补充空的表单
上级 4f6439a5
...@@ -929,19 +929,11 @@ public class JavaToPdfHtmlFreeMarker { ...@@ -929,19 +929,11 @@ public class JavaToPdfHtmlFreeMarker {
} }
} }
if (checkList2.size() != 0) { if (checkList2.size() != 0) {
int size=30-i; lists.add(checkList2);
lists.add(addCheck(checkList2,size));
} }
return lists; return lists;
} }
private static List<Check> addCheck(List<Check> checks,Integer size){
for (int i=0;i<size;i++){
checks.add(new Check(null,null,null,null,"",1,"",1));
}
return checks;
}
/** /**
* freemarker渲染html 核查确认单据 * freemarker渲染html 核查确认单据
...@@ -2005,19 +1997,11 @@ public class JavaToPdfHtmlFreeMarker { ...@@ -2005,19 +1997,11 @@ public class JavaToPdfHtmlFreeMarker {
} }
} }
if (checkList2.size() != 0) { if (checkList2.size() != 0) {
int size=pageSize-i; lists.add(checkList2);
lists.add(addExportDevice(checkList2,size));
} }
return lists; return lists;
} }
private static List<ExportDevice> addExportDevice(List<ExportDevice> exportDevices,Integer size){
for (int i=0;i<size;i++){
exportDevices.add(new ExportDevice(null,null,null,null,"",1,null,null,1,""));
}
return exportDevices;
}
private static Map<String,Object> toExportDeviceMap(Confirm confirm, List<ExportDevice> list,Integer page,Integer count,String time){ private static Map<String,Object> toExportDeviceMap(Confirm confirm, List<ExportDevice> list,Integer page,Integer count,String time){
Map<String,Object> data = new HashMap(); Map<String,Object> data = new HashMap();
data.put("title",confirm.getTitle()); data.put("title",confirm.getTitle());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论