From 03f30b7e8f4fe5e704834513c461124fb2cb4dd5 Mon Sep 17 00:00:00 2001 From: Mr-wang Date: Tue, 25 Jul 2023 11:33:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2,PPT,excel=E6=96=87=E4=BB=B6=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/coe/pal/output/zd/HSSFUtils.java | 32 +++++++++++-------- .../zd/UpFileExcelAndPptController.java | 21 ++++++------ 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/HSSFUtils.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/HSSFUtils.java index 9ed38b92..2006386e 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/HSSFUtils.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/HSSFUtils.java @@ -91,21 +91,25 @@ public class HSSFUtils { mergeSheetAllRegion(tmpSheet, newExcelSheet); // 设置单元格列宽度 // 获取最后一个单元格位置 - if (tmpSheet.getRow(tmpSheet.getFirstRowNum())==null){ + if (tmpSheet!=null) { - }else { - int len = tmpSheet.getRow(tmpSheet.getFirstRowNum()).getLastCellNum(); - for (int i = 0; i < len; i++) { - newExcelSheet.setColumnWidth(i, tmpSheet.getColumnWidth(i)); - } - // 复制每行内容 - Iterator it = tmpSheet.iterator(); - while (it.hasNext()) { - HSSFRow tmpRow = (HSSFRow) it.next(); - // 创建新行 - HSSFRow newExcelRow = newExcelSheet.createRow(tmpRow.getRowNum()); - // 复制行 - copyExcelRow(workbook, tmpRow, newExcelRow); + + if (tmpSheet.getRow(tmpSheet.getFirstRowNum()) == null) { + + } else { + int len = tmpSheet.getRow(tmpSheet.getFirstRowNum()).getLastCellNum(); + for (int i = 0; i < len; i++) { + newExcelSheet.setColumnWidth(i, tmpSheet.getColumnWidth(i)); + } + // 复制每行内容 + Iterator it = tmpSheet.iterator(); + while (it.hasNext()) { + HSSFRow tmpRow = (HSSFRow) it.next(); + // 创建新行 + HSSFRow newExcelRow = newExcelSheet.createRow(tmpRow.getRowNum()); + // 复制行 + copyExcelRow(workbook, tmpRow, newExcelRow); + } } } } diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/UpFileExcelAndPptController.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/UpFileExcelAndPptController.java index 1b2ea946..f1268ec0 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/UpFileExcelAndPptController.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/UpFileExcelAndPptController.java @@ -132,7 +132,9 @@ public class UpFileExcelAndPptController { // 查找并替换参数 //这个是替换文件编码 - String file_number = DBSql.getString("select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '" + pl_uuid + "' and PROPERTYID = 'file_number'"); + // + // + String file_number = DBSql.getString("select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '" + pl_uuid + "' and PROPERTYID IN ('file_number','form_number')"); if (StringUtils.isEmpty(file_number)){ replaceParameter(sheet, "{{file_code}}", ""); }else { @@ -140,7 +142,7 @@ public class UpFileExcelAndPptController { replaceParameter(sheet, "{{file_code}}", file_number); } //这个是替换生效日期 - String file_date = DBSql.getString("select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '" + pl_uuid + "' and PROPERTYID = 'effective_date'"); + String file_date = DBSql.getString("select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '" + pl_uuid + "' and PROPERTYID IN('effective_date','form_effective_date') "); if (UtilString.isNotEmpty(file_date)){ replaceParameter(sheet, "{{file_date}}", file_date); @@ -148,7 +150,8 @@ public class UpFileExcelAndPptController { replaceParameter(sheet, "{{file_date}}", ""); } //这个是替换适用范围 - String fanwei = DBSql.getString("select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '" + pl_uuid + "' and PROPERTYID = 'application'"); + // + String fanwei = DBSql.getString("select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '" + pl_uuid + "' and PROPERTYID in( 'application','form_Scope_application')"); if (UtilString.isNotEmpty(fanwei)){ replaceParameter(sheet, "{{fanwei}}", fanwei); @@ -172,7 +175,7 @@ public class UpFileExcelAndPptController { XSSFSheet sheet_xd = workbook.getSheet("修订记录"); - + replaceParameter(sheet_xd, "{{process_name}}", process_name); // 获取参数所在的行和列 int parameterRow = 3; // 假设参数在第二行 @@ -274,7 +277,7 @@ public class UpFileExcelAndPptController { // 查找并替换参数 //这个是替换文件编码 - String file_number = DBSql.getString("select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '" + pl_uuid + "' and PROPERTYID = 'file_number'"); + String file_number = DBSql.getString("select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '" + pl_uuid + "' and PROPERTYID IN('form_number','file_number')"); if (StringUtils.isEmpty(file_number)){ replaceParameter(sheet, "{{file_code}}", ""); }else { @@ -282,7 +285,7 @@ public class UpFileExcelAndPptController { replaceParameter(sheet, "{{file_code}}", file_number); } //这个是替换生效日期 - String file_date = DBSql.getString("select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '" + pl_uuid + "' and PROPERTYID = 'effective_date'"); + String file_date = DBSql.getString("select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '" + pl_uuid + "' and PROPERTYID IN('effective_date','form_effective_date')"); if (UtilString.isNotEmpty(file_date)){ replaceParameter(sheet, "{{file_date}}", file_date); @@ -290,7 +293,7 @@ public class UpFileExcelAndPptController { replaceParameter(sheet, "{{file_date}}", ""); } //这个是替换适用范围 - String fanwei = DBSql.getString("select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '" + pl_uuid + "' and PROPERTYID = 'application'"); + String fanwei = DBSql.getString("select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '" + pl_uuid + "' and PROPERTYID in( 'application','form_Scope_application')"); if (UtilString.isNotEmpty(fanwei)){ replaceParameter(sheet, "{{fanwei}}", fanwei); @@ -313,7 +316,7 @@ public class UpFileExcelAndPptController { HSSFSheet sheet_xd = workbook.getSheet("修订记录"); - + replaceParameter(sheet_xd, "{{process_name}}", process_name); // 获取参数所在的行和列 @@ -403,7 +406,7 @@ public class UpFileExcelAndPptController { } catch ( Exception e) { e.printStackTrace(); } - }else { + }else if (name.endsWith(".pptx")||name.endsWith(".ppt")){ UpfileModel model_old = new UpfileModel(); model_old.setUuid(UUIDGener.getUUID()); model_old.setPl_uuid("f9df56d7-a6b2-442c-9898-822619057493");