From 782d4da197dade505d979a6a9de72c2ceea63402 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 19 Jul 2024 14:33:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20scc=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/WithoutDistributeExcelTemplate.java | 26 +++---- ...essStandardComplianceCheckServiceImpl.java | 73 +++++++++---------- .../modules/activiti/util/ExcelUtils.java | 29 ++++++++ 3 files changed, 75 insertions(+), 53 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java index 85e592de..c5ba0a6b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java @@ -1,16 +1,9 @@ package com.jero.modules.activiti.process.standardComplianceCheck.entity.vo; -import com.baomidou.mybatisplus.annotation.TableField; import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.laws.utils.ExcelExportUtilPro; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecgframework.poi.excel.annotation.ExcelCollection; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; @Data public class WithoutDistributeExcelTemplate { @@ -56,7 +49,7 @@ public class WithoutDistributeExcelTemplate { */ @ApiModelProperty(value = "合规评估结果") @Dict(dicCode = "evaluation_result") - @Excel(name = "评估结果", width = 15, orderNum = "6", dicCode = "evaluation_result") + @Excel(name = "评估结果", width = 15, orderNum = "6") private String result; /** @@ -77,7 +70,7 @@ public class WithoutDistributeExcelTemplate { * 整改周期 */ @ApiModelProperty(value = "整改周期") - @Excel(name = "整改方案", width = 15, orderNum = "9") + @Excel(name = "整改周期", width = 15, orderNum = "9") private String correctionPeriod; /** @@ -111,23 +104,24 @@ public class WithoutDistributeExcelTemplate { /** * 附件 */ - @ApiModelProperty(value = "佐证材料") - @ExcelCollection(name = "", orderNum = "14") - @TableField(exist = false) - private List fileList = Collections.emptyList(); +// @ApiModelProperty(value = "佐证材料") +// @ExcelCollection(name = "", orderNum = "14") +// @TableField(exist = false) +// private List fileList = Collections.emptyList(); /** * 佐证材料 */ @ApiModelProperty(value = "佐证材料") + @Excel(name = "佐证材料", width = 15, orderNum = "13") @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") private String material; private String sort; - public List obtainFileIds() { - return material != null ? Arrays.asList(material.split(",")) : Collections.emptyList(); - } +// public List obtainFileIds() { +// return material != null ? Arrays.asList(material.split(",")) : Collections.emptyList(); +// } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index dfbd2b8c..4995d973 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -513,10 +513,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl newRecordsExport = new ArrayList<>(data); Workbook workbook = ExcelExportUtil - .exportExcel(exportParams, WithoutDistributeExcelTemplate.class, detailInfoList); + .exportExcel(exportParams, WithoutDistributeExcelTemplate.class, data); // 生成超链接 - excelExportUtilPro.generateHyperlink(newRecordsExport, workbook, - WithoutDistributeExcelTemplate::getFileList, 13); +// excelExportUtilPro.generateHyperlink(newRecordsExport, workbook, +// WithoutDistributeExcelTemplate::getFileList, 13); // 导出excel workbook.write(fos); // 生成并导出zip @@ -578,24 +578,24 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl headers; - try { - headers = ExcelUtils.getHeaderFromExcel(file.getInputStream(), 0); - } catch (Exception e) { - errorMsgs.add("模板错误，请按照系统模板导入！"); - resultMap.put("msg", errorMsgs); - resultMap.put("flag", YesOrNoEnum.NO.getValue()); - log.error(e.getMessage(), e); - return resultMap; // 返回错误信息 - } - - // 使用静态方法验证header - boolean isMatched = headers.equals(ExcelUtils.getSortedHeadersFromClass(WithoutDistributeExcelTemplate.class)); - if (!isMatched) { - errorMsgs.add("模板错误，请按照系统模板导入！"); - resultMap.put("msg", errorMsgs); - resultMap.put("flag", YesOrNoEnum.NO.getValue()); - return resultMap; // 返回错误信息 - } +// try { +// headers = ExcelUtils.getHeaderFromExcel(file.getInputStream(), 0); +// } catch (Exception e) { +// errorMsgs.add("模板错误，请按照系统模板导入！"); +// resultMap.put("msg", errorMsgs); +// resultMap.put("flag", YesOrNoEnum.NO.getValue()); +// log.error(e.getMessage(), e); +// return resultMap; // 返回错误信息 +// } +// +// // 使用静态方法验证header +// boolean isMatched = headers.equals(ExcelUtils.getSortedHeadersFromClass(WithoutDistributeExcelTemplate.class)); +// if (!isMatched) { +// errorMsgs.add("模板错误，请按照系统模板导入！"); +// resultMap.put("msg", errorMsgs); +// resultMap.put("flag", YesOrNoEnum.NO.getValue()); +// return resultMap; // 返回错误信息 +// } ImportParams params = new ImportParams(); params.setTitleRows(0); @@ -607,8 +607,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl list = ExcelImportUtil .importExcel(inputStream, WithoutDistributeExcelTemplate.class, params); - list.remove(0); - list.remove(0); if (list.isEmpty()) { errorMsgs.add("文件暂无数据，请检查后重试。"); resultMap.put("msg", errorMsgs); @@ -648,20 +646,21 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl getHeaderFromExcelXSSF(InputStream is, Integer index) throws Exception { + List headers = new ArrayList<>(); + + Workbook workbook = new XSSFWorkbook(is); + Sheet sheet = workbook.getSheetAt(0); + + // HeadRow在index 1 + for (int rowIndex = index; rowIndex <= index; rowIndex++) { + Row row = sheet.getRow(rowIndex); + for (Cell cell : row) { + String cellValue = cell.getStringCellValue(); + // 否则，直接添加到列表 + headers.add(cellValue); + } + } + return headers; + } + /** * 获取一个类的所有带@Excel注解的字段的name属性值，并按照orderNum正序排序。 * @@ -554,6 +580,9 @@ public class ExcelUtils { } public String uploadFile(String material, Map fileMap) { + if (StrUtil.isBlank(material)) { + return ""; + } return importUtil.convertFileIds(material, fileMap); } }