代码提交

无关风月

2024-09-10 40113c0d5644a7b2bfab73cc735f5dea73741f90

代码提交

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java

@@ -22,6 +22,8 @@
    private Integer type;
    @ApiModelProperty("状态（1未出账 2已出账）")
    private Integer state;
    @ApiModelProperty("状态（1日结 2月结）")
    private Integer orderState;
    @ApiModelProperty("uid 前端忽略")
    private String uid;


 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java

@@ -289,7 +289,8 @@
    @ApiOperation(value = "下载", tags = {"管理后台-账户结算账单"})
    @PutMapping("/downloadAccount")
    public R downloadAccount(@RequestBody ChargingListQuery dto,HttpServletResponse response)
    {
    {   dto.setPageCurr(1);
        dto.setPageSize(99999999);
        AccountListVO data = orderClient.accountBillList(dto).getData();
        try {
            response.setCharacterEncoding(Constants.UTF8);

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

@@ -72,8 +72,7 @@
    public R<AccountListVO> accountBillList(@RequestBody ChargingListQuery dto) {
        AccountListVO accountListVO = new AccountListVO();
        ChargingBillVO res = chargingBillService.chargingBillList(dto);
        dto.setPageCurr(1);
        dto.setPageSize(99999999);

        ChargingBillVO res1 = chargingBillService.chargingBillList(dto);
        List<ChargingBillListVO> records = res1.getList().getRecords();
        accountListVO.setBillCount(records.size());

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml

@@ -517,4 +517,5 @@
            and (t1.end_time between #{endTime1} and #{endTime2})
        </if>
    </select>

</mapper>