diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java index cdb5b11a..3e073a44 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java @@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -171,4 +172,25 @@ public class ProcessStandardComplianceCheckController extends JeroController processInfoVO); List generate(ProcessStandardComplianceCheck scc) throws Exception; + + void exportXlsDistribute(String taskId, HttpServletResponse response); + + void exportXlsNotDistribute(String taskId, HttpServletResponse response); } 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 22ba05b3..dd6a5e3b 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 @@ -41,6 +41,7 @@ import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.sys.utils.UserUtils; import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.service.ISysDepartService; +import com.jero.modules.system.util.SysWaterMarkUtil; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.delegate.DelegateTask; @@ -48,11 +49,14 @@ import org.activiti.engine.runtime.ProcessInstance; import org.apache.http.entity.ContentType; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ImportParams; +import org.springframework.beans.factory.annotation.Value; import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.util.*; @@ -73,35 +77,32 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl processInfoVO) { @@ -420,6 +421,51 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl handleData = this.getHandleData(taskId); + List detailInfoList = handleData.getBusinessInfoDTO().getDetailInfoList(); + String fileName = ""; + String url = exportExcelTempPath.replace(EXPORT_EXCEL_TEMP, fileName); + File file = new File(url); +// if (!file.exists()) { +// boolean mkdirs = file.mkdirs(); +// log.info("创建临时目录:{}", mkdirs); +// } +// try (FileOutputStream fos = new FileOutputStream(url + File.separator + fileName + ".xls")){ +// // 获取数据 +// +// +// this.settleDocuments(url, records); +// +// // 生成excel +// ExportParams exportParams = new ExportParams(); +// exportParams.setType(ExcelType.HSSF); +// // 复制一份数据 +// List newRecordsExport = new ArrayList<>(records); +// Workbook workbook = ExcelExportUtil.exportExcel(exportParams, LawsEvaluationNotMetLibrary.class, records); +// // 生成超链接 +// generateHyperlink(newRecordsExport, workbook); +// // 导出excel +// workbook.write(fos); +// // 生成并导出zip +// ZipUtil.toZip(url, response.getOutputStream(), response, true); +// } catch (Exception e) { +// log.error("导出excel异常", e); +// throw new JeroBootException("导出excel异常", e); +// } finally { +// // 删除文件 +// if (new File(url).exists()) { +// FileUtils.deleteFolders(url); +// } +// } + } + + @Override + public void exportXlsNotDistribute(String taskId, HttpServletResponse response) { + ProcessInfoVO handleData = this.getHandleData(taskId); + } + private List getSplitDataByStandard(ProcessStandardComplianceCheck scc) { String standardId = scc.getStandardId(); String fileType = scc.getSplitFileSource(); diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java index e2b2b94d..ecdd0972 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java @@ -6,13 +6,16 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; +import com.jero.modules.laws.utils.ExcelExportUtilPro; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelCollection; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.List; @@ -23,6 +26,7 @@ import java.util.List; */ @TableName(value ="laws_evaluation_not_met_library") @Data +@EqualsAndHashCode(callSuper = false) public class LawsEvaluationNotMetLibrary implements Serializable { @@ -218,7 +222,11 @@ public class LawsEvaluationNotMetLibrary implements Serializable { @ApiModelProperty(value = "附件") @ExcelCollection(name = "", orderNum = "13") @TableField(exist = false) - private List fileList = Collections.emptyList(); + private List fileList = Collections.emptyList(); + + public List obtainFileIds() { + return file != null ? Arrays.asList(file.split(",")) : Collections.emptyList(); + } /** * 标准ID diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryMapper.xml b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryMapper.xml index 24baf452..34354ecd 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryMapper.xml @@ -13,9 +13,7 @@