From 3df8757ade3bdef3b5a142c846680102589260bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:36:37 +0800
Subject: [PATCH] 农事操作,种植记录查询新增,地块,溯源码查询修改

---
 src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java |   21 +++++++++++++++++++--
 1 files changed, 19 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..26b6df4 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
@@ -30,6 +30,11 @@
 		return page.setRecords(baseMapper.selectFarmProductStockPage(page, farmProductStock));
 	}
 
+	@Override
+	public List<FarmProductStockVO> selectFarmProductStockPages(FarmProductStockVO farmProductStock) {
+		return baseMapper.selectFarmProductStockPages(farmProductStock);
+	}
+
 	/**
 	 * 统计产量
 	 * @param farmProductStock
@@ -66,8 +71,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 deptId) {
+		//按年统计
+		if (year.length()==4){
+			return baseMapper.statisticsStockYear(year,deptId);
+		}
+		//按月统计
+		if (year.length()==7){
+			return baseMapper.statisticsStockMonth(year,deptId);
+		}
+		//按日统计
+		if (year.length()==10){
+			return baseMapper.statisticsStockDay(year,deptId);
+		}
+		return null;
 	}
 	@Override
 	public Map<String, String> productsSupervise(String year,String deptId) {

--
Gitblit v1.9.3