|
@@ -223,7 +223,7 @@ public class FirstController extends BladeController {
|
|
|
|
|
|
//获取填报数据
|
|
|
List<Map<String, Object>> firstBusinessDataInfos = this.getFirstBusinessDataImpl2(firstId, tableNode.getContractId());
|
|
|
-
|
|
|
+ ProjectInfo projectInfo = projectInfoService.getById(tableNode.getProjectId());
|
|
|
try {
|
|
|
//处理数据
|
|
|
for (Map<String, Object> dataMap : firstBusinessDataInfos) {
|
|
@@ -241,6 +241,17 @@ public class FirstController extends BladeController {
|
|
|
Document doc = Jsoup.parse(htmlString);
|
|
|
Element table = doc.select("table").first();
|
|
|
Elements trs = table.select("tr");
|
|
|
+ //添加标题
|
|
|
+ CellRange[] columns = sheet.getMergedCells();
|
|
|
+ for (int i = 0; i < columns.length; i++) {
|
|
|
+ CellRange cellRange = columns[i];
|
|
|
+ System.out.println(cellRange.getStyle().getFont().getSize());
|
|
|
+ if (cellRange.getStyle().getFont().getSize() >= 12) {
|
|
|
+ cellRange.setText(projectInfo.getProjectName());
|
|
|
+ cellRange.getStyle().getFont().setSize(20);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(dataMap)) {
|
|
|
for (String val : dataMap.keySet()) {
|