Merge remote-tracking branch 'origin/dev_20230912_Platform' into dev_20230912_Platform

This commit is contained in:
zyx.net
2023-09-27 10:10:14 +08:00
@@ -10842,7 +10842,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
String sheetName = "";
if (StringUtils.equals(cut,CutEnum.CN.getValue())) {
sheetName = "问题管理";
header = "标题,问题类型,PS_ISSUE,创建人,创建时间,相关法规,相关项目,责任部门,问题状态,描述和分析";
header = "标题,问题类型,PS_ISSUE,创建人,创建时间,相关法规,责任部门,问题状态,描述和分析";
// header = "标题,问题类型,PS_ISSUE,创建人,创建时间,相关法规,相关项目,责任部门,问题状态,描述和分析";
} else if (StringUtils.equals(cut,CutEnum.EN.getValue())) {
header = "Title,Issue Type,PS-ISSUE,Creator,Create Date,Related Regualtions,Related Project,Resonsible Field,Status,Description";
sheetName = "Problem management";
@@ -10888,10 +10889,10 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
row.createCell(3).setCellValue((String) dataList.get(i).get("createBy"));
row.createCell(4).setCellValue((String) dataList.get(i).get("createTime"));
row.createCell(5).setCellValue((String) dataList.get(i).get("lawsName"));
row.createCell(6).setCellValue((String) dataList.get(i).get("projectName"));
row.createCell(7).setCellValue((String) dataList.get(i).get("dutyTerritory"));
row.createCell(8).setCellValue((String) dataList.get(i).get("problemState"));
row.createCell(9).setCellValue((String) dataList.get(i).get("description"));
// row.createCell(6).setCellValue((String) dataList.get(i).get("projectName"));
row.createCell(6).setCellValue((String) dataList.get(i).get("dutyTerritory"));
row.createCell(7).setCellValue((String) dataList.get(i).get("problemState"));
row.createCell(8).setCellValue((String) dataList.get(i).get("description"));
}
}
try {