修改签收出错bug

wjli

2024-04-10 81af4cff627b7ec1e125b90f4fd57392c6d70588

 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;
@@ -19,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
@@ -32,6 +34,7 @@
@Api(tags = "状态统计报表接口")
@RequestMapping("/xboot/signCount")
@Transactional
@PermitAll
public class SignCountController {

    @Autowired
@@ -83,26 +86,49 @@

    @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();
    @PermitAll
    public void export1(OrderStatusCount orderStatusCount, HttpServletResponse response) throws IOException {
        if(orderStatusCount.getSendDateStart()!=null){
            orderStatusCount.setSendDateStart(orderStatusCount.getSendDateStart() + " 00:00:00");
        }
        if(orderStatusCount.getSendDateEnd()!=null){
            orderStatusCount.setSendDateEnd(orderStatusCount.getSendDateEnd() + " 23:59:59");
        }
        List<OrderStatusCount> orderStatus = this.iSignCountService.signCounts2New(orderStatusCount);
        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")
    @ApiOperation(value = "签收统计信息表", notes = "签收统计信息表")
    public  Result<IPage<OrderStatusCount>> signCounts(OrderStatusCount orderStatusCount,QueryRequest queryRequest) {
        if(orderStatusCount.getSendDateStart()!=null){
            orderStatusCount.setSendDateStart(orderStatusCount.getSendDateStart() + " 00:00:00");
        }
        if(orderStatusCount.getSendDateEnd()!=null){
            orderStatusCount.setSendDateEnd(orderStatusCount.getSendDateEnd() + " 23:59:59");
        }
        IPage<OrderStatusCount> data = this.iSignCountService.signCounts(orderStatusCount,queryRequest);
        return  new ResultUtil<IPage<OrderStatusCount>>().setData(data);
    }

    @GetMapping(value = "/selectBySignNew")
    @ApiOperation(value = "签收统计信息表1", notes = "签收统计信息表1")
    @PermitAll
    public  Result<IPage<OrderStatusCount>> signCountsNew(OrderStatusCount orderStatusCount,QueryRequest queryRequest) {
        if(orderStatusCount.getSendDateStart()!=null){
            orderStatusCount.setSendDateStart(orderStatusCount.getSendDateStart() + " 00:00:00");
        }
        if(orderStatusCount.getSendDateEnd()!=null){
            orderStatusCount.setSendDateEnd(orderStatusCount.getSendDateEnd() + " 23:59:59");
        }
        IPage<OrderStatusCount> data = this.iSignCountService.signCountsNew(orderStatusCount,queryRequest);
        return  new ResultUtil<IPage<OrderStatusCount>>().setData(data);
    }