From 6a8ff464c7979bc9412734de5642592b804a656c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 七月 2025 17:44:41 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/GovernmentCloudAccountController.java | 61 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/GovernmentCloudAccountController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/GovernmentCloudAccountController.java
index 8e39b20..f67bcbc 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/GovernmentCloudAccountController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/GovernmentCloudAccountController.java
@@ -5,10 +5,13 @@
import com.ruoyi.account.api.vo.GovernmentCloudAccountVO;
import com.ruoyi.account.service.*;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.BasePojo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
/**
@@ -43,25 +46,59 @@
@Autowired
private TInvoiceInformationService invoiceInformationService;
+
/**
* 政务云查询数据接口
* @return
*/
@PostMapping("/listAll")
R<GovernmentCloudAccountVO> 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";
GovernmentCloudAccountVO governmentCloudAccountVO = new GovernmentCloudAccountVO();
- List<TAppCoupon> list1 = tAppCouponService.lambdaQuery().between(TAppCoupon::getCreateTime, start, end).list();
- List<TAppUser> list2 = appUserService.lambdaQuery().between(TAppUser::getCreateTime, start, end).list();
- List<TAppUserAddress> list3 = appUserAddressService.lambdaQuery().between(TAppUserAddress::getCreateTime, start, end).list();
- List<TAppUserCar> list4 = appUserCarService.lambdaQuery().between(TAppUserCar::getCreateTime, start, end).list();
- List<TAppUserIntegralChange> list5 = appUserIntegralChangeService.lambdaQuery().between(TAppUserIntegralChange::getCreateTime, start, end).list();
- List<TAppUserSign> list6 = appUserSignService.lambdaQuery().between(TAppUserSign::getCreateTime, start, end).list();
- List<TAppUserTag> list7 = appUserTagService.lambdaQuery().between(TAppUserTag::getCreateTime, start, end).list();
- List<TAppUserVipDetail> list8 = appUserVipDetailService.lambdaQuery().between(TAppUserVipDetail::getCreateTime, start, end).list();
- List<TInviteUser> list9 = inviteUserService.lambdaQuery().between(TInviteUser::getCreateTime, start, end).list();
- List<TInvoiceInformation> list10 = invoiceInformationService.lambdaQuery().between(TInvoiceInformation::getCreateTime, start, end).list();
+ List<TAppCoupon> list1 = tAppCouponService.lambdaQuery()
+ .ge(TAppCoupon::getCreateTime, start)
+ .le(TAppCoupon::getCreateTime, end)
+ .list();
+ List<TAppUser> list2 = appUserService.lambdaQuery()
+ .ge(TAppUser::getCreateTime, start)
+ .le(TAppUser::getCreateTime, end)
+ .list();
+ List<TAppUserAddress> list3 = appUserAddressService.lambdaQuery()
+ .ge(TAppUserAddress::getCreateTime, start)
+ .le(TAppUserAddress::getCreateTime, end)
+ .list();
+ List<TAppUserCar> list4 = appUserCarService.lambdaQuery()
+ .ge(TAppUserCar::getCreateTime, start)
+ .le(TAppUserCar::getCreateTime, end)
+ .list();
+ List<TAppUserIntegralChange> list5 = appUserIntegralChangeService.lambdaQuery()
+ .ge(TAppUserIntegralChange::getCreateTime, start)
+ .le(TAppUserIntegralChange::getCreateTime, end)
+ .list();
+ List<TAppUserSign> list6 = appUserSignService.lambdaQuery()
+ .ge(TAppUserSign::getCreateTime, start)
+ .le(TAppUserSign::getCreateTime, end)
+ .list();
+ List<TAppUserTag> list7 = appUserTagService.lambdaQuery()
+ .ge(TAppUserTag::getCreateTime, start)
+ .le(TAppUserTag::getCreateTime, end)
+ .list();
+ List<TAppUserVipDetail> list8 = appUserVipDetailService.lambdaQuery()
+ .ge(TAppUserVipDetail::getCreateTime, start)
+ .le(TAppUserVipDetail::getCreateTime, end)
+ .list();
+ List<TInviteUser> list9 = inviteUserService.lambdaQuery()
+ .ge(TInviteUser::getCreateTime, start)
+ .le(TInviteUser::getCreateTime, end)
+ .list();
+ List<TInvoiceInformation> list10 = invoiceInformationService.lambdaQuery()
+ .ge(TInvoiceInformation::getCreateTime, start)
+ .le(TInvoiceInformation::getCreateTime, end)
+ .list();
+ for (TAppUserSign tAppUserSign : list6) {
+ tAppUserSign.setSignDay(null);
+ }
governmentCloudAccountVO.setAppCoupons(list1);
governmentCloudAccountVO.setAppUsers(list2);
governmentCloudAccountVO.setAppUserAddresses(list3);
--
Gitblit v1.7.1