ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 77918

Browse Source 
企业标准--下载模板--模板的字段与辅助文档上不一致
This commit is contained in:
mzaxd
2023-11-03 16:21:43 +08:00
parent 9bf88d654d
commit 56ac556105
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+13 -3
View File
@@ -1446,10 +1446,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
* @param row3
* @param fieldList
*/
private void setRow3CellValue(Row row3, List<LawsTag> fieldList) {
private void setRow3CellValue(Row row3, List<LawsTag> 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<LawsTag> 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;
}
}