From f7767066879bf66e7bb3ba80e0240bc9664f2f01 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 16 七月 2025 20:59:25 +0800
Subject: [PATCH] 政务云数据上传bug修改
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GovernmentCloudOtherController.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 5c91885..b6c13cd 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
@@ -77,7 +77,6 @@
String end = LocalDate.now().minusDays(1)+" 23:59:59";
GovernmentCloudOtherVO governmentCloudAccountVO = new GovernmentCloudOtherVO();
List<Operator> list1 = operatorService.lambdaQuery()
-
.list();
List<TActivity> list2 = activityService.lambdaQuery()
.ge(TActivity::getCreateTime,start)
@@ -100,10 +99,8 @@
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<THtml> list9 = htmlService.lambdaQuery()
+ .list();
List<TIntegralRule> list10 = integralRuleService.lambdaQuery()
.list();
List<TInvoiceType> list11 = invoiceTypeService.lambdaQuery()
@@ -112,9 +109,9 @@
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<TRoleSite> list13 = roleSiteService.lambdaQuery().list();
List<TSystemConfiguration> list14 = systemConfigurationService.lambdaQuery().list();
-// List<TUserSite> list15 = userSiteService.lambdaQuery().between(TUserSite::getCreateTime, start, end).list();
+ List<TUserSite> list15 = userSiteService.lambdaQuery().list();
List<TUserTag> list16 = userTagService.lambdaQuery()
.ge(TUserTag::getCreateTime,start)
.le(TUserTag::getCreateTime,end) .list();
@@ -122,7 +119,7 @@
.ge(TVip::getCreateTime,start)
.le(TVip::getCreateTime,end)
.list();
-// governmentCloudAccountVO.setOperators(list1);
+ governmentCloudAccountVO.setOperators(list1);
governmentCloudAccountVO.setActivities(list2);
governmentCloudAccountVO.setAdvertisings(list3);
governmentCloudAccountVO.setCompanies(list4);
@@ -130,14 +127,15 @@
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.setRoleSites(list13);
+ governmentCloudAccountVO.setSystemConfigurations(list14);
+ governmentCloudAccountVO.setUserSites(list15);
governmentCloudAccountVO.setUserTags(list16);
governmentCloudAccountVO.setVips(list17);
-
return R.ok(governmentCloudAccountVO);
}
--
Gitblit v1.7.1