|
@@ -245,6 +245,7 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
|
|
|
DocumentBuilder builder = new DocumentBuilder(doc2);
|
|
|
builder.moveToDocumentEnd();
|
|
|
createTable(builder,doc2,collect3);
|
|
|
+ doc.appendDocument(doc2,ImportFormatMode.KEEP_DIFFERENT_STYLES);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
@@ -252,7 +253,7 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
|
|
|
//initWeekWord(doc, collect3,"a808c450f6484ae18baa5afc4a8fc112");
|
|
|
}
|
|
|
try {
|
|
|
- doc.appendDocument(doc2,ImportFormatMode.KEEP_DIFFERENT_STYLES);
|
|
|
+
|
|
|
Map<String, List<ZhcxPersistentManageDo>> collect1 = list.stream().filter(item -> !"0f11e70cd21843ee998a1ce5279028eb".equals(item.getBelongorgid())
|
|
|
&& "处罚".equals(item.getType())
|
|
|
&& item.getAmount() != null && item.getAmount().compareTo(BigDecimal.ZERO) > 0)
|