qichexitong/car-system-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
huahua
2024-07-27 15:49:01 +08:00
parent b958ec911b
commit 936a878af7
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lxk-admin/src/main/java/com/zbkj/admin/controller/merchant/MerchantMonthlyMaintenanceAnalysis.java
View File

@@ -31,7 +31,7 @@ public class MerchantMonthlyMaintenanceAnalysis {
public CommonResult<MonthlyMaintenanceAnalysisResponse> 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<List<PieChartResponse>> 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<List<PieChartResponse>> 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<List<PieChartResponse>> 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<List<PieChartResponse>> 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<MonthlyMaintenanceAnalysisAvgResponse> 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<TopChartResponse> 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<ModelAndCompanyPieResponse> 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));

18
lxk-admin/src/main/java/com/zbkj/admin/controller/platform/PlatformMonthlyMaintenanceAnalysis.java
View File

@@ -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<PieChartResponse>());
}
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<PieChartResponse>());
}
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<PieChartResponse>());
}
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<PieChartResponse>());
}
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));