接货图片和签收图片的完善

wjli

2023-05-25 13c9e4032de40598787a453de77ba0db94666664

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/SignCountController.java

@@ -4,6 +4,7 @@
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.your.common.ExcelFillCellMergeStrategy;
import cn.exrick.xboot.your.entity.OrderStatusCount;
import cn.exrick.xboot.your.entity.QueryRequest;
import cn.exrick.xboot.your.entity.SignCount;
@@ -83,16 +84,18 @@

    @GetMapping("/outExcels")
    @ApiOperation(value = "导出签收统计信息表", notes = "导出签收统计信息表")
    public void export1(OrderStatusCount orderStatusCount, HttpServletResponse response,QueryRequest queryRequest) throws IOException {
        List<OrderStatusCount> orderStatus = this.iSignCountService.signCounts(orderStatusCount,queryRequest).getRecords();
    public void export1(OrderStatusCount orderStatusCount, HttpServletResponse response) throws IOException {
        List<OrderStatusCount> orderStatus = this.iSignCountService.signCounts2New(orderStatusCount);
        System.out.println(orderStatus);
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        String fileName = URLEncoder.encode("签收数量统计报表", "UTF-8");
        String fileName2 = new String(fileName.getBytes("UTF-8"), "ISO8859-1");
//        response.setHeader("Content-dispostion", "attachment;filename="+fileName+".xls");
        response.setHeader("Content-disposition", "attachment;filename=" + fileName2 + ".xlsx");
        EasyExcel.write(response.getOutputStream(),OrderStatusCount.class).
                sheet(0).doWrite(orderStatus);
        EasyExcel.write(response.getOutputStream(),OrderStatusCount.class)
                 .registerWriteHandler(new ExcelFillCellMergeStrategy(1,new int[]{0,1,2,9})) // 基于 column 长度，自动适配。最大 255 宽度
                .sheet(0).doWrite(orderStatus);
    }

    @GetMapping(value = "/selectBySign")