Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-09-07 4fd0278cda787a91eb35d95d6491f5485afe3e48

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java

@@ -13,8 +13,10 @@
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.dto.SettlementConfirmAdd;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TSettlementConfirm;
import com.ruoyi.order.api.query.SettlementListQuery;
import com.ruoyi.order.api.vo.SettlementTotalVO;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import com.ruoyi.order.api.vo.ChargingOrderTimeVO;
import com.ruoyi.order.api.model.ChargingListQuery;
@@ -28,6 +30,8 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.time.format.DateTimeFormatter;
import java.util.List;

/**
 * <p>
@@ -60,10 +64,16 @@
    }

    @GetMapping(value = "/settlementTotal")
    @ApiOperation(value = "结算确认表-列表查询", tags = {"管理后台-财务结算"})
    @ApiParam(name = "time", value = "汇报时间yyyy-MM")
    public AjaxResult<ChargingOrderListInfoVO> settlementTotal(String time) {
        return AjaxResult.success(null);
    @ApiOperation(value = "结算汇总-列表查询", tags = {"管理后台-财务结算"})
    @ApiParam(name = "time", value = "汇报时间2024-01-01 00:00:00")
    public AjaxResult<SettlementTotalVO> settlementTotal(String time) {
        SettlementTotalVO res = chargingOrderService.settlementTotal(time);
        return AjaxResult.success(res);
    }
    @GetMapping(value = "/settlementTotalR")
    public R<SettlementTotalVO> settlementTotalR( String time) {
        SettlementTotalVO res = chargingOrderService.settlementTotal(time);
        return R.ok(res);
    }
    @PostMapping(value = "/settlementAdd")
    @ApiOperation(value = "结算确认表-生成/保存结算确认表", tags = {"管理后台-财务结算"})
@@ -79,7 +89,18 @@
    }
    @GetMapping(value = "/downloadSettlement/{uid}")
    public R<TSettlementConfirm> downloadSettlement(@PathVariable("uid") String uid) {
        return R.ok(tSettlementConfirmService.getById(uid));
        TSettlementConfirm byId = tSettlementConfirmService.getById(uid);
        if (byId!=null){
            List<TChargingOrder> list = chargingOrderService.lambdaQuery().eq(TChargingOrder::getSiteId, byId.getSiteId())
                    .between(TChargingOrder::getStartTime, byId.getStartTime(), byId.getEndTime())
                    .eq(TChargingOrder::getStatus, 5)
                    .eq(TChargingOrder::getRechargePaymentStatus, 2).list();
            byId.setList(list);
            String format = byId.getStartTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss"));
            String format1 = byId.getEndTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss"));
            byId.setTime(format+"至"+format1);
        }
        return R.ok(byId);
    }

}