diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarItemsStandCompareHisEOController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarItemsStandCompareHisEOController.java index 592ac8d..8c92016 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarItemsStandCompareHisEOController.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarItemsStandCompareHisEOController.java @@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.jero.common.api.vo.Result; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.util.MessageUtils; import com.jero.modules.compare.entity.SarItemsCompareHisEO; import com.jero.modules.compare.service.ISarItemsCompareHisEOService; import com.jero.modules.system.util.MyStringUtils; @@ -20,6 +23,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; @RestController @RequestMapping("/compare/sarItemsCompareHis") @@ -62,4 +67,19 @@ public class SarItemsStandCompareHisEOController extends JeroController { void insertSelective(SarItemsCompareHisEO sarItemsCompareHisEO); @@ -12,4 +15,6 @@ public interface ISarItemsCompareHisEOService extends IService queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(SarItemsCompareHisEO::getStandHisId, standHisId); + queryWrapper.lambda().orderByDesc(SarItemsCompareHisEO::getCreateTime); + List exportDataList = this.list(queryWrapper); + + try{ + String fileName = fileOriName + ".xlsx"; + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + workbook = ExcelExportUtil.exportExcel(exportParams, SarItemsCompareHisEO.class, exportDataList); + response.setHeader("Content-Disposition", + "attachment; filename=\"" + ReadExcel.encodeFileName(fileName, request) +"\""); + response.setContentType("application/force-download"); + response.flushBuffer(); + os = response.getOutputStream(); + workbook.write(os); + os.flush(); + os.close(); // 后开先关 + } catch (Exception e) { + logger.error(e.getMessage(), e); + throw new JeroBootException("下载文件失败,请重试"); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(os); + org.apache.poi.util.IOUtils.closeQuietly(excelOS); + } + } } diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index d2c327b..441655d 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -1168,12 +1168,10 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl fieldLists = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName()); List fieldLists = new ArrayList<>(); // 列表展示字段 List fieldListSelect = fieldLists.stream().filter(v -> YesOrNoEnum.YES.getValue() .equals(String.valueOf(v.getIsShowList()))).collect(Collectors.toList()); -// List onlCgformFieldList = onlCgformFieldService.getFieldList(ModuleEnum.FILE_SPLIT_ITEMS.getValue()); // 树形数据字典 dictId List dictIdList = fieldListSelect.stream() .filter(e -> (YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())) @@ -2509,12 +2507,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl