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 14:30:18 +08:00
parent 33148af266
commit 0b709c903e
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lxk-admin/src/main/java/com/zbkj/admin/controller/merchant/MerchantMonthlyAnalysis.java
View File

@@ -31,29 +31,29 @@ public class MerchantMonthlyAnalysis {
public CommonResult<MonthlyAnalysisResponse> indexDate(@RequestBody BusinessAnalysisRequest 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.getMonthlyAnalysis(request));
}
@ApiOperation(value = "车系占比和消耗占比")
@ApiOperation(value = "配件车型占比饼图和配件消耗top条形图")
@RequestMapping(value = "/pie/chart", method = RequestMethod.POST)
public CommonResult<MonthlyAnalysisConsumeResponse> pieChart(@RequestBody BusinessAnalysisRequest 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.getMonthlyAnalysisPiecCart(request));
}
@ApiOperation(value = "采购占比")
@ApiOperation(value = "配件采购金额top20")
@RequestMapping(value = "/purchase", method = RequestMethod.POST)
public CommonResult<SeriesResponse> purchase(@RequestBody BusinessAnalysisRequest 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.getMonthlyAnalysisPurchase(request));

10
lxk-admin/src/main/java/com/zbkj/admin/controller/platform/PlatformMonthlyAnalysis.java
View File

@@ -30,31 +30,31 @@ public class PlatformMonthlyAnalysis {
if (request.getMerId() == null || request.getMerId() == 0) {
return CommonResult.success();
}
if (StrUtil.isNotBlank(request.getDateLimit())) {
if (StrUtil.isBlank(request.getDateLimit())) {
request.setDateLimit("preMonth");
}
return CommonResult.success(homeService.getMonthlyAnalysis(request));
}
@ApiOperation(value = "车系占比和消耗占比")
@ApiOperation(value = "配件车型占比饼图和配件消耗top条形图")
@RequestMapping(value = "/pie/chart", method = RequestMethod.POST)
public CommonResult<MonthlyAnalysisConsumeResponse> pieChart(@RequestBody BusinessAnalysisRequest request) {
if (request.getMerId() == null || request.getMerId() == 0) {
return CommonResult.success();
}
if (StrUtil.isNotBlank(request.getDateLimit())) {
if (StrUtil.isBlank(request.getDateLimit())) {
request.setDateLimit("preMonth");
}
return CommonResult.success(homeService.getMonthlyAnalysisPiecCart(request));
}
@ApiOperation(value = "采购占比")
@ApiOperation(value = "配件采购金额top20")
@RequestMapping(value = "/purchase", method = RequestMethod.POST)
public CommonResult<SeriesResponse> purchase(@RequestBody BusinessAnalysisRequest request) {
if (request.getMerId() == null || request.getMerId() == 0) {
return CommonResult.success();
}
if (StrUtil.isNotBlank(request.getDateLimit())) {
if (StrUtil.isBlank(request.getDateLimit())) {
request.setDateLimit("preMonth");
}
return CommonResult.success(homeService.getMonthlyAnalysisPurchase(request));

4
lxk-service/src/main/java/com/zbkj/service/service/impl/AccessoryServiceProcureImpl.java
View File

@@ -22,9 +22,9 @@ import com.zbkj.common.request.accessory.AccessoryProcureNewlyRequest;
import com.zbkj.common.request.accessory.AccessoryProcureRequest;
import com.zbkj.common.request.accessory.AccessoryProcureSearchRequest;
import com.zbkj.common.response.SeriesResponse;
import com.zbkj.common.utils.JsonUtils;
import com.zbkj.common.utils.LxkDateUtil;
import com.zbkj.common.utils.LxkUtil;
import com.zbkj.common.utils.JsonUtils;
import com.zbkj.common.vo.DateLimitUtilVo;
import com.zbkj.service.dao.accessory.AccessoryProcureDao;
import com.zbkj.service.service.AccessoryProcureItemService;
@@ -281,7 +281,7 @@ public class AccessoryServiceProcureImpl extends ServiceImpl<AccessoryProcureDao
DateLimitUtilVo dateLimitUtilVo = LxkDateUtil.getDateLimit(request.getDateLimit());
lqw.between(AccessoryProcure::getCreateTime, dateLimitUtilVo.getStartTime(), dateLimitUtilVo.getEndTime());
}
lqw.eq(AccessoryProcure::getPaid, Boolean.TRUE);
// lqw.eq(AccessoryProcure::getPaid, Boolean.TRUE); //貌似没有用到这个字段
List<AccessoryProcure> list = list(lqw);
if (CollUtil.isEmpty(list)) {
return resp;