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-other/src/main/java/com/ruoyi/other/controller/GovernmentCloudOtherController.java | 71 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GovernmentCloudOtherController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GovernmentCloudOtherController.java
index c12c799..5c91885 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GovernmentCloudOtherController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GovernmentCloudOtherController.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.controller;
+import com.ruoyi.chargingPile.api.model.Partner;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.vo.GovernmentCloudOrderVO;
@@ -13,6 +14,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;
@@ -71,29 +73,56 @@
*/
@PostMapping("/listAll")
R<GovernmentCloudOtherVO> 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";
GovernmentCloudOtherVO governmentCloudAccountVO = new GovernmentCloudOtherVO();
+ List<Operator> list1 = operatorService.lambdaQuery()
-
- List<Operator> list1 = operatorService.lambdaQuery().list();
- List<TActivity> list2 = activityService.lambdaQuery().between(TActivity::getCreateTime, start, end).list();
- List<TAdvertising> list3 = advertisingService.lambdaQuery().between(TAdvertising::getCreateTime, start, end).list();
- List<TCompany> list4 = companyService.lambdaQuery().between(TCompany::getCreateTime, start, end).list();
- List<TCoupon> list5 = couponService.lambdaQuery().between(TCoupon::getCreateTime, start, end).list();
- List<TEnterpriseUserApplication> list6 = enterpriseUserApplicationService.lambdaQuery().between(TEnterpriseUserApplication::getCreateTime, start, end).list();
- List<TEvaluationTag> list7 = evaluationTagService.lambdaQuery().between(TEvaluationTag::getCreateTime, start, end).list();
- List<TGoods> list8 = goodsService.lambdaQuery().between(TGoods::getCreateTime, start, end).list();
- List<THtml> list9 = htmlService.lambdaQuery().list();
- List<TIntegralRule> list10 = integralRuleService.lambdaQuery().list();
- List<TInvoiceType> list11 = invoiceTypeService.lambdaQuery().between(TInvoiceType::getCreateTime, start, end).list();
- List<TNotice> list12 = noticeService.lambdaQuery().between(TNotice::getCreateTime, start, end).list();
+ .list();
+ List<TActivity> list2 = activityService.lambdaQuery()
+ .ge(TActivity::getCreateTime,start)
+ .le(TActivity::getCreateTime,end) .list();
+ List<TAdvertising> list3 = advertisingService.lambdaQuery()
+ .ge(TAdvertising::getCreateTime,start)
+ .le(TAdvertising::getCreateTime,end) .list();
+ List<TCompany> list4 = companyService.lambdaQuery()
+ .ge(TCompany::getCreateTime,start)
+ .le(TCompany::getCreateTime,end) .list();
+ List<TCoupon> list5 = couponService.lambdaQuery()
+ .ge(TCoupon::getCreateTime,start)
+ .le(TCoupon::getCreateTime,end) .list();
+ List<TEnterpriseUserApplication> list6 = enterpriseUserApplicationService.lambdaQuery()
+ .ge(TEnterpriseUserApplication::getCreateTime,start)
+ .le(TEnterpriseUserApplication::getCreateTime,end) .list();
+ List<TEvaluationTag> list7 = evaluationTagService.lambdaQuery()
+ .ge(TEvaluationTag::getCreateTime,start)
+ .le(TEvaluationTag::getCreateTime,end) .list();
+ List<TGoods> list8 = goodsService.lambdaQuery()
+ .ge(TGoods::getCreateTime,start)
+ .le(TGoods::getCreateTime,end) .list();
+// List<THtml> list9 = htmlService.lambdaQuery()
+// .ge(THtml::getCreateTime,start)
+// .le(THtml::getCreateTime,end)
+// .list();
+ List<TIntegralRule> list10 = integralRuleService.lambdaQuery()
+ .list();
+ List<TInvoiceType> list11 = invoiceTypeService.lambdaQuery()
+ .ge(TInvoiceType::getCreateTime,start)
+ .le(TInvoiceType::getCreateTime,end) .list();
+ List<TNotice> list12 = noticeService.lambdaQuery()
+ .ge(TNotice::getCreateTime,start)
+ .le(TNotice::getCreateTime,end) .list();
// List<TRoleSite> list13 = roleSiteService.lambdaQuery().between(TRoleSite::getCreateTime, start, end).list();
List<TSystemConfiguration> list14 = systemConfigurationService.lambdaQuery().list();
// List<TUserSite> list15 = userSiteService.lambdaQuery().between(TUserSite::getCreateTime, start, end).list();
- List<TUserTag> list16 = userTagService.lambdaQuery().between(TUserTag::getCreateTime, start, end).list();
- List<TVip> list17 = vipService.lambdaQuery().between(TVip::getCreateTime, start, end).list();
- governmentCloudAccountVO.setOperators(list1);
+ List<TUserTag> list16 = userTagService.lambdaQuery()
+ .ge(TUserTag::getCreateTime,start)
+ .le(TUserTag::getCreateTime,end) .list();
+ List<TVip> list17 = vipService.lambdaQuery()
+ .ge(TVip::getCreateTime,start)
+ .le(TVip::getCreateTime,end)
+ .list();
+// governmentCloudAccountVO.setOperators(list1);
governmentCloudAccountVO.setActivities(list2);
governmentCloudAccountVO.setAdvertisings(list3);
governmentCloudAccountVO.setCompanies(list4);
@@ -101,11 +130,11 @@
governmentCloudAccountVO.setEnterpriseUserApplications(list6);
governmentCloudAccountVO.setEvaluationTags(list7);
governmentCloudAccountVO.setGoods(list8);
- governmentCloudAccountVO.setHtmls(list9);
- governmentCloudAccountVO.setIntegralRules(list10);
+// governmentCloudAccountVO.setHtmls(list9);
+// governmentCloudAccountVO.setIntegralRules(list10);
governmentCloudAccountVO.setInvoiceTypes(list11);
governmentCloudAccountVO.setNotices(list12);
- governmentCloudAccountVO.setSystemConfigurations(list14);
+// governmentCloudAccountVO.setSystemConfigurations(list14);
governmentCloudAccountVO.setUserTags(list16);
governmentCloudAccountVO.setVips(list17);
--
Gitblit v1.7.1