xuhy
2024-11-01 17d24b4fe9ab65c057408e2fac6f9d9c4c30402e
修改
1个文件已修改
14 ■■■■■ 已修改文件
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -2634,18 +2634,22 @@
    @Override
    public PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto) {
        String startTime = null;
        String endTime = null;
        if (StringUtils.hasLength(dto.getStartTime())){
            dto.setType(1);
            String[] split = dto.getStartTime().split(" - ");
            dto.setStartTime(split[0]);
            dto.setEndTime(split[1]);
            startTime = split[0];
            endTime = split[1];
        }
        if (StringUtils.hasLength(dto.getEndTime())){
            dto.setType(2);
            String[] split = dto.getStartTime().split(" - ");
            dto.setStartTime(split[0]);
            dto.setEndTime(split[1]);
            String[] split = dto.getEndTime().split(" - ");
            startTime = split[0];
            endTime = split[1];
        }
        dto.setStartTime(startTime);
        dto.setEndTime(endTime);
        PageInfo<TSettlementConfirm> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
        List<TSettlementConfirm> list = tSettlementConfirmMapper.settlementList(pageInfo,dto);
        for (TSettlementConfirm tSettlementConfirm : list) {