From 936a878af77963cb7852f13a65b96ae0b347ebe9 Mon Sep 17 00:00:00 2001 From: huahua <610665905@qq.com> Date: Sat, 27 Jul 2024 15:49:01 +0800 Subject: [PATCH] fix --- .../MerchantMonthlyMaintenanceAnalysis.java | 16 ++++++++-------- .../PlatformMonthlyMaintenanceAnalysis.java | 18 ++++++++---------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/lxk-admin/src/main/java/com/zbkj/admin/controller/merchant/MerchantMonthlyMaintenanceAnalysis.java b/lxk-admin/src/main/java/com/zbkj/admin/controller/merchant/MerchantMonthlyMaintenanceAnalysis.java index b8aa7f1d..451b7236 100644 --- a/lxk-admin/src/main/java/com/zbkj/admin/controller/merchant/MerchantMonthlyMaintenanceAnalysis.java +++ b/lxk-admin/src/main/java/com/zbkj/admin/controller/merchant/MerchantMonthlyMaintenanceAnalysis.java @@ -31,7 +31,7 @@ public class MerchantMonthlyMaintenanceAnalysis { public CommonResult indexDate(@RequestBody MonthlyMaintenanceAnalysis request) { SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser(); request.setMerId(systemAdmin.getMerId()); - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceAnalysisLattice(request)); @@ -42,7 +42,7 @@ public class MerchantMonthlyMaintenanceAnalysis { public CommonResult> modelRatio(@RequestBody MonthlyMaintenanceAnalysis request) { SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser(); request.setMerId(systemAdmin.getMerId()); - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceAnalysisModelRatio(request)); @@ -53,7 +53,7 @@ public class MerchantMonthlyMaintenanceAnalysis { public CommonResult> company(@RequestBody MonthlyMaintenanceAnalysis request) { SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser(); request.setMerId(systemAdmin.getMerId()); - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceAnalysisCompany(request)); @@ -64,7 +64,7 @@ public class MerchantMonthlyMaintenanceAnalysis { public CommonResult> yieldModel(@RequestBody MonthlyMaintenanceAnalysis request) { SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser(); request.setMerId(systemAdmin.getMerId()); - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceAnalysisYieldModel(request)); @@ -75,7 +75,7 @@ public class MerchantMonthlyMaintenanceAnalysis { public CommonResult> yieldCompany(@RequestBody MonthlyMaintenanceAnalysis request) { SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser(); request.setMerId(systemAdmin.getMerId()); - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceAnalysisYieldCompany(request)); @@ -86,7 +86,7 @@ public class MerchantMonthlyMaintenanceAnalysis { public CommonResult indexDateAvg(@RequestBody MonthlyMaintenanceAnalysis request) { SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser(); request.setMerId(systemAdmin.getMerId()); - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceAnalysisAvgLattice(request)); @@ -97,7 +97,7 @@ public class MerchantMonthlyMaintenanceAnalysis { public CommonResult yieldModelAndCompany(@RequestBody MonthlyMaintenanceAnalysis request) { SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser(); request.setMerId(systemAdmin.getMerId()); - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceModelAndCompany(request)); @@ -108,7 +108,7 @@ public class MerchantMonthlyMaintenanceAnalysis { public CommonResult costModelAndCompany(@RequestBody MonthlyMaintenanceAnalysis request) { SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser(); request.setMerId(systemAdmin.getMerId()); - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceCostModelAndCompany(request)); diff --git a/lxk-admin/src/main/java/com/zbkj/admin/controller/platform/PlatformMonthlyMaintenanceAnalysis.java b/lxk-admin/src/main/java/com/zbkj/admin/controller/platform/PlatformMonthlyMaintenanceAnalysis.java index d83e64b2..2a9bed73 100644 --- a/lxk-admin/src/main/java/com/zbkj/admin/controller/platform/PlatformMonthlyMaintenanceAnalysis.java +++ b/lxk-admin/src/main/java/com/zbkj/admin/controller/platform/PlatformMonthlyMaintenanceAnalysis.java @@ -2,11 +2,9 @@ package com.zbkj.admin.controller.platform; import cn.hutool.core.util.StrUtil; import com.zbkj.admin.service.HomeService; -import com.zbkj.common.model.admin.SystemAdmin; import com.zbkj.common.request.MonthlyMaintenanceAnalysis; import com.zbkj.common.response.*; import com.zbkj.common.result.CommonResult; -import com.zbkj.common.utils.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -33,7 +31,7 @@ public class PlatformMonthlyMaintenanceAnalysis { if (request.getMerId() == null) { return CommonResult.success(new MonthlyMaintenanceAnalysisResponse()); } - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceAnalysisLattice(request)); @@ -45,7 +43,7 @@ public class PlatformMonthlyMaintenanceAnalysis { if (request.getMerId() == null) { return CommonResult.success(new ArrayList()); } - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceAnalysisModelRatio(request)); @@ -57,7 +55,7 @@ public class PlatformMonthlyMaintenanceAnalysis { if (request.getMerId() == null) { return CommonResult.success(new ArrayList()); } - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceAnalysisCompany(request)); @@ -69,7 +67,7 @@ public class PlatformMonthlyMaintenanceAnalysis { if (request.getMerId() == null) { return CommonResult.success(new ArrayList()); } - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceAnalysisYieldModel(request)); @@ -81,7 +79,7 @@ public class PlatformMonthlyMaintenanceAnalysis { if (request.getMerId() == null) { return CommonResult.success(new ArrayList()); } - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceAnalysisYieldCompany(request)); @@ -93,7 +91,7 @@ public class PlatformMonthlyMaintenanceAnalysis { if (request.getMerId() == null) { return CommonResult.success(new MonthlyMaintenanceAnalysisAvgResponse()); } - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceAnalysisAvgLattice(request)); @@ -105,7 +103,7 @@ public class PlatformMonthlyMaintenanceAnalysis { if (request.getMerId() == null) { return CommonResult.success(new TopChartResponse()); } - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceModelAndCompany(request)); @@ -117,7 +115,7 @@ public class PlatformMonthlyMaintenanceAnalysis { if (request.getMerId() == null) { return CommonResult.success(new ModelAndCompanyPieResponse()); } - if (StrUtil.isNotBlank(request.getDateLimit())) { + if (StrUtil.isBlank(request.getDateLimit())) { request.setDateLimit("preMonth"); } return CommonResult.success(homeService.getMonthlyMaintenanceCostModelAndCompany(request));