|
@@ -1055,7 +1055,6 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
|
|
|
builder.endRow();
|
|
|
int count = 0;
|
|
|
for (ZhcxCommissionCheckDetailDo detailWordVO : res.getDetailList()) {
|
|
|
- count++;
|
|
|
String chtestcontent = "";
|
|
|
builder.insertCell();
|
|
|
//合并单元格
|
|
@@ -1071,6 +1070,7 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
|
|
|
builder.getCellFormat().setHorizontalMerge(CellMerge.PREVIOUS); // 设置为合并到前一个单元格
|
|
|
}
|
|
|
} else {
|
|
|
+ count++;
|
|
|
// 设置样式
|
|
|
buildTableTextContent(builder, 40, 9, DEFAULT_FONT_NAME, false, String.valueOf(count));
|
|
|
builder.insertCell();
|