无关风月
6 天以前 19653375fdbfd0b4ce017d53be112f7af97b56cc
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GovernmentCloudOtherController.java
@@ -77,52 +77,59 @@
        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)
                .le(TActivity::getCreateTime,end)                .list();
                .le(TActivity::getCreateTime,end)
                .list();
        List<TAdvertising> list3 = advertisingService.lambdaQuery()
                .ge(TAdvertising::getCreateTime,start)
                .le(TAdvertising::getCreateTime,end)                .list();
                .le(TAdvertising::getCreateTime,end)
                .list();
        List<TCompany> list4 = companyService.lambdaQuery()
                .ge(TCompany::getCreateTime,start)
                .le(TCompany::getCreateTime,end)                .list();
                .le(TCompany::getCreateTime,end)
                .list();
        List<TCoupon> list5 = couponService.lambdaQuery()
                .ge(TCoupon::getCreateTime,start)
                .le(TCoupon::getCreateTime,end)                .list();
                .le(TCoupon::getCreateTime,end)
                .list();
        List<TEnterpriseUserApplication> list6 = enterpriseUserApplicationService.lambdaQuery()
                .ge(TEnterpriseUserApplication::getCreateTime,start)
                .le(TEnterpriseUserApplication::getCreateTime,end)                .list();
                .le(TEnterpriseUserApplication::getCreateTime,end)
                .list();
        List<TEvaluationTag> list7 = evaluationTagService.lambdaQuery()
                .ge(TEvaluationTag::getCreateTime,start)
                .le(TEvaluationTag::getCreateTime,end)                .list();
                .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();
                .le(TGoods::getCreateTime,end)
                .list();
        List<THtml> list9 = htmlService.lambdaQuery()
                .list();
        List<TIntegralRule> list10 = integralRuleService.lambdaQuery()
                .list();
        List<TInvoiceType> list11 = invoiceTypeService.lambdaQuery()
                .ge(TInvoiceType::getCreateTime,start)
                .le(TInvoiceType::getCreateTime,end)                .list();
                .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();
                .le(TNotice::getCreateTime,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();
                .le(TUserTag::getCreateTime,end)
                .list();
        List<TVip> list17 = vipService.lambdaQuery()
                .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 +137,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);
    }