From 56ac55610507c525abccee9bf8b5e5fa5362449d Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 3 Nov 2023 16:21:30 +0800 Subject: [PATCH] fix: 77918 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 企业标准--下载模板--模板的字段与辅助文档上不一致 --- .../service/impl/LawsCommonServiceImpl.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 48a7974c..ad4ed9c1 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1446,10 +1446,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @param row3 * @param fieldList */ - private void setRow3CellValue(Row row3, List fieldList) { + private void setRow3CellValue(Row row3, List fieldList, CellStyle style) { for (int i = 0; i < fieldList.size(); i++) { // 创建单元格 Cell cell = row3.createCell(i); + cell.setCellStyle(style); cell.setCellValue(FieldShowTypeEnum.getDescription(fieldList.get(i).getFieldShowType())); } } @@ -1968,7 +1969,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { List fieldList = new ArrayList<>(); // 依据条款 LawsTag clauseTag = new LawsTag(); - clauseTag.setDbFieldTxt("依据条款"); + clauseTag.setDbFieldTxt("章节条款"); clauseTag.setFieldShowType(FieldShowTypeEnum.TEXT_BOX.getValue()); clauseTag.setFieldMustInput(YesOrNoEnum.YES.getValue()); fieldList.add(clauseTag); @@ -1980,6 +1981,13 @@ public class LawsCommonServiceImpl implements ILawsCommonService { requirementTag.setFieldMustInput(YesOrNoEnum.YES.getValue()); fieldList.add(requirementTag); + // 标准内容或要求 + LawsTag rectificationDepartment = new LawsTag(); + rectificationDepartment.setDbFieldTxt("稽查部门"); + rectificationDepartment.setFieldShowType(FieldShowTypeEnum.SINGLE_ORGANIZATION_DIALOG.getValue()); + rectificationDepartment.setFieldMustInput(YesOrNoEnum.NO.getValue()); + fieldList.add(rectificationDepartment); + // 创建一个Excel工作簿 return this.createWorkBookWithLawsTags(fieldList); } @@ -2042,6 +2050,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { row2.setHeightInPoints(95); // 创建一个单元格样式，并设置为自动换行 CellStyle style = workbook.createCellStyle(); + // 设置文字在单元格中垂直居中 + style.setVerticalAlignment(VerticalAlignment.CENTER); style.setWrapText(true); sheet.addMergedRegion(new CellRangeAddress( 1, @@ -2060,7 +2070,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 创建第三行并添加固定内容 Row row3 = sheet.createRow(2); row3.setHeightInPoints(105); - this.setRow3CellValue(row3, fieldList); + this.setRow3CellValue(row3, fieldList, style); return workbook; } }