From d95f6551e8214d69cd0fd511ec693641eb61ba16 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Aug 2022 10:36:26 +0800
Subject: [PATCH] 1、大屏首页接口修复，解决double类型相加精度问题
---
src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java
index dacf4c2..c502f69 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java
@@ -1,6 +1,7 @@
package org.springblade.modules.farmplant.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.mp.support.Condition;
import org.springblade.modules.farmplant.entity.FarmProductStock;
import org.springblade.modules.farmplant.mapper.FarmProductStockMapper;
import org.springblade.modules.farmplant.service.FarmProductStockService;
@@ -28,6 +29,16 @@
@Override
public IPage<FarmProductStockVO> selectFarmProductStockPage(IPage<FarmProductStockVO> page, FarmProductStockVO farmProductStock) {
return page.setRecords(baseMapper.selectFarmProductStockPage(page, farmProductStock));
+ }
+
+ @Override
+ public List<FarmProductStockVO> selectFarmProductStockPages(FarmProductStockVO farmProductStock) {
+ return baseMapper.selectFarmProductStockPages(farmProductStock);
+ }
+
+ @Override
+ public List<FarmProductStock> findFarmProductStockByFarmIdAndStrainId(String farmId, Integer strainId) {
+ return baseMapper.findFarmProductStockByFarmIdAndStrainId(farmId,strainId);
}
/**
@@ -66,8 +77,20 @@
return baseMapper.statisticsStock(year,deptId);
}
@Override
- public Map<String, String> statisticsStockMonth(String year,String deptId) {
- return baseMapper.statisticsStockMonth(year,deptId);
+ public List<Map<String, String>> statisticsStockMonth(String year,String farmId) {
+ //按年统计
+ if (year.length()==4){
+ return baseMapper.statisticsStockYear(year,farmId);
+ }
+ //按月统计
+ if (year.length()==7){
+ return baseMapper.statisticsStockMonth(year,farmId);
+ }
+ //按日统计
+ if (year.length()==10){
+ return baseMapper.statisticsStockDay(year,farmId);
+ }
+ return null;
}
@Override
public Map<String, String> productsSupervise(String year,String deptId) {
--
Gitblit v1.9.3