From 8b48244257eaa19bfd8a761b3d2309cea25a8aaa Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 16 七月 2025 16:20:48 +0800
Subject: [PATCH] 政务云数据上传bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/GovernmentCloudOrderController.java | 77 ++++++++++++++++++++++++++++----------
1 files changed, 57 insertions(+), 20 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/GovernmentCloudOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/GovernmentCloudOrderController.java
index d13e4b4..c9e79f1 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/GovernmentCloudOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/GovernmentCloudOrderController.java
@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -70,27 +71,63 @@
*/
@PostMapping("/listAll")
R<GovernmentCloudOrderVO> listAll() {
- LocalDateTime end = LocalDateTime.now();
- LocalDateTime start = LocalDateTime.now().minusDays(1);
+ String start = LocalDate.now().minusDays(1)+" 00:00:00";
+ String end = LocalDate.now().minusDays(1)+" 23:59:59";
GovernmentCloudOrderVO governmentCloudAccountVO = new GovernmentCloudOrderVO();
- List<AccountingStrategyDetailOrder> list1 = accountingStrategyDetailOrderService.lambdaQuery().between(AccountingStrategyDetailOrder::getCreateTime, start, end).list();
- List<AccountingStrategyOrder> list2 = accountingStrategyOrderService.lambdaQuery().between(AccountingStrategyOrder::getCreateTime, start, end).list();
- List<TChargingBill> list3 = chargingBillService.lambdaQuery().between(TChargingBill::getCreateTime, start, end).list();
- List<TChargingOrderAccountingStrategy> list4 = chargingOrderAccountingStrategyService.lambdaQuery().between(TChargingOrderAccountingStrategy::getCreateTime, start, end).list();
- List<TChargingOrderRefund> list5 = chargingOrderRefundService.lambdaQuery().between(TChargingOrderRefund::getCreateTime, start, end).list();
- List<TChargingOrder> list6 = chargingOrderService.lambdaQuery().between(TChargingOrder::getCreateTime, start, end).list();
- List<TExchangeOrder> list7 = exchangeOrderService.lambdaQuery().between(TExchangeOrder::getCreateTime, start, end).list();
- List<TGrantVip> list8 = grantVipService.lambdaQuery().between(TGrantVip::getCreateTime, start, end).list();
- List<TOrderAppeal> list9 = orderAppealService.lambdaQuery().between(TOrderAppeal::getCreateTime, start, end).list();
- List<TOrderEvaluate> list10 = orderEvaluateService.lambdaQuery().between(TOrderEvaluate::getCreateTime, start, end).list();
- List<TOrderEvaluateTag> list11 = orderEvaluateTagService.lambdaQuery().between(TOrderEvaluateTag::getCreateTime, start, end).list();
- List<TOrderInvoiceDetail> list12 = orderInvoiceDetailService.lambdaQuery().between(TOrderInvoiceDetail::getCreateTime, start, end).list();
- List<TOrderInvoice> list13 = orderInvoiceService.lambdaQuery().between(TOrderInvoice::getCreateTime, start, end).list();
- List<TSettlementConfirm> list14 = settlementConfirmService.lambdaQuery().between(TSettlementConfirm::getCreateTime, start, end).list();
- List<TShoppingOrderRefund> list15 = shoppingOrderRefundService.lambdaQuery().between(TShoppingOrderRefund::getCreateTime, start, end).list();
- List<TVipOrderRefund> list16 = vipOrderRefundService.lambdaQuery().between(TVipOrderRefund::getCreateTime, start, end).list();
- List<TVipOrder> list17 = vipOrderService.lambdaQuery().between(TVipOrder::getCreateTime, start, end).list();
- List<TShoppingOrder> list18 = shoppingOrderService.lambdaQuery().between(TShoppingOrder::getCreateTime, start, end).list();
+ List<AccountingStrategyDetailOrder> list1 = accountingStrategyDetailOrderService.lambdaQuery()
+ .ge(AccountingStrategyDetailOrder::getCreateTime,start)
+ .le(AccountingStrategyDetailOrder::getCreateTime,end) .list();
+ List<AccountingStrategyOrder> list2 = accountingStrategyOrderService.lambdaQuery()
+ .ge(AccountingStrategyOrder::getCreateTime,start)
+ .le(AccountingStrategyOrder::getCreateTime,end) .list();
+ List<TChargingBill> list3 = chargingBillService.lambdaQuery()
+ .ge(TChargingBill::getCreateTime,start)
+ .le(TChargingBill::getCreateTime,end) .list();
+ List<TChargingOrderAccountingStrategy> list4 = chargingOrderAccountingStrategyService.lambdaQuery()
+ .ge(TChargingOrderAccountingStrategy::getCreateTime,start)
+ .le(TChargingOrderAccountingStrategy::getCreateTime,end) .list();
+ List<TChargingOrderRefund> list5 = chargingOrderRefundService.lambdaQuery()
+ .ge(TChargingOrderRefund::getCreateTime,start)
+ .le(TChargingOrderRefund::getCreateTime,end) .list();
+ List<TChargingOrder> list6 = chargingOrderService.lambdaQuery()
+ .ge(TChargingOrder::getCreateTime,start)
+ .le(TChargingOrder::getCreateTime,end) .list();
+ List<TExchangeOrder> list7 = exchangeOrderService.lambdaQuery()
+ .ge(TExchangeOrder::getCreateTime,start)
+ .le(TExchangeOrder::getCreateTime,end) .list();
+ List<TGrantVip> list8 = grantVipService.lambdaQuery()
+ .ge(TGrantVip::getCreateTime,start)
+ .le(TGrantVip::getCreateTime,end) .list();
+ List<TOrderAppeal> list9 = orderAppealService.lambdaQuery()
+ .ge(TOrderAppeal::getCreateTime,start)
+ .le(TOrderAppeal::getCreateTime,end) .list();
+ List<TOrderEvaluate> list10 = orderEvaluateService.lambdaQuery()
+ .ge(TOrderEvaluate::getCreateTime,start)
+ .le(TOrderEvaluate::getCreateTime,end) .list();
+ List<TOrderEvaluateTag> list11 = orderEvaluateTagService.lambdaQuery()
+ .ge(TOrderEvaluateTag::getCreateTime,start)
+ .le(TOrderEvaluateTag::getCreateTime,end) .list();
+ List<TOrderInvoiceDetail> list12 = orderInvoiceDetailService.lambdaQuery()
+ .ge(TOrderInvoiceDetail::getCreateTime,start)
+ .le(TOrderInvoiceDetail::getCreateTime,end) .list();
+ List<TOrderInvoice> list13 = orderInvoiceService.lambdaQuery()
+ .ge(TOrderInvoice::getCreateTime,start)
+ .le(TOrderInvoice::getCreateTime,end) .list();
+ List<TSettlementConfirm> list14 = settlementConfirmService.lambdaQuery()
+ .ge(TSettlementConfirm::getCreateTime,start)
+ .le(TSettlementConfirm::getCreateTime,end) .list();
+ List<TShoppingOrderRefund> list15 = shoppingOrderRefundService.lambdaQuery()
+ .ge(TShoppingOrderRefund::getCreateTime,start)
+ .le(TShoppingOrderRefund::getCreateTime,end) .list();
+ List<TVipOrderRefund> list16 = vipOrderRefundService.lambdaQuery()
+ .ge(TVipOrderRefund::getCreateTime,start)
+ .le(TVipOrderRefund::getCreateTime,end) .list();
+ List<TVipOrder> list17 = vipOrderService.lambdaQuery()
+ .ge(TVipOrder::getCreateTime,start)
+ .le(TVipOrder::getCreateTime,end) .list();
+ List<TShoppingOrder> list18 = shoppingOrderService.lambdaQuery()
+ .ge(TShoppingOrder::getCreateTime,start)
+ .le(TShoppingOrder::getCreateTime,end) .list();
governmentCloudAccountVO.setAccountingStrategyDetailOrders(list1);
governmentCloudAccountVO.setAccountingStrategyOrders(list2);
--
Gitblit v1.7.1