|
@@ -341,7 +341,7 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
|
|
|
baseMapper.deleteTreeByPid(zhcxCommissionCheckDo.getId());
|
|
|
treeDoList.forEach(tree -> {
|
|
|
ZhcxCommissionCheckDetailTreeDo target = new ZhcxCommissionCheckDetailTreeDo();
|
|
|
- BeanUtils.copyProperties(tree, target,tree.getAnnex(),tree.getSummary());
|
|
|
+ BeanUtils.copyProperties(tree, target, tree.getAnnex(), tree.getSummary());
|
|
|
String id = tree.getId().split("_")[0] + "_" + zhcxCommissionCheckDo.getProjectcode() + zhcxCommissionCheckDo.getMachineno();
|
|
|
target.setId(id);
|
|
|
target.setRemark(tree.getId().split("_")[0]);
|
|
@@ -1008,9 +1008,9 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
|
|
|
buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_1, 15, true, res.getChapterno() + "." + res.getTitleContent(), null);
|
|
|
} else {
|
|
|
if (res.getLevel() == 2) {
|
|
|
- buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_2, 15, true, res.getChapterno() + "." + res.getTitleContent(), null);
|
|
|
+ buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_3, 14, true, res.getChapterno() + "." + res.getTitleContent(), null);
|
|
|
} else {
|
|
|
- buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_3, 15, true, res.getChapterno() + "." + res.getTitleContent(), null);
|
|
|
+ buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_4, 12, true, res.getChapterno() + "." + res.getTitleContent(), null);
|
|
|
}
|
|
|
}
|
|
|
//摘要及图片
|
|
@@ -1030,6 +1030,7 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
|
|
|
shape.setWidth(80); // 宽度 200 磅
|
|
|
shape.setHeight(80); // 高度 150 磅
|
|
|
}
|
|
|
+ builder.writeln();//换行
|
|
|
}
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(res.getDetailList())) {
|