From 4e8eedbcaa35a3cce9e50dad54db9633e71d169f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 05 Sep 2022 17:02:48 +0800
Subject: [PATCH] 修改文件上传路径

---
 src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java b/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java
index a46d225..dd5bd5b 100644
--- a/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java
+++ b/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java
@@ -48,6 +48,22 @@
 	}
 
 	@Override
+	public IPage<FarmingRecordVO> selectFarmingRecordPageByNz(IPage<FarmingRecordVO> page, FarmingRecordVO farm) {
+		List<FarmingRecordVO> recordVOS = baseMapper.selectFarmingRecordPageByNz(page, farm);
+		recordVOS.forEach(recordVO->{
+			//查询字典对应的名称
+			DictBiz dictBiz = new DictBiz();
+			dictBiz.setTenantId(farm.getTenantId());
+			dictBiz.setCode("farmingType");
+			dictBiz.setDictKey(recordVO.getType());
+			DictBiz one = dictBizService.getOne(new QueryWrapper<>(dictBiz));
+			//设置名称
+			recordVO.setTypeName(one.getDictValue());
+		});
+		return page.setRecords(recordVOS);
+	}
+
+	@Override
 	public List<FarmingRecordVO> selectFarmingRecordPages(FarmingRecordVO farm) {
 		List<FarmingRecordVO> farmingRecordVOS = baseMapper.selectFarmingRecordPages(farm);
 		farmingRecordVOS.forEach(recordVO->{
@@ -69,8 +85,8 @@
 	 * @return
 	 */
 	@Override
-	public Object getFarmingCount(String deptId) {
-		return baseMapper.getFarmingCount(deptId);
+	public Object getFarmingCount(String farmId) {
+		return baseMapper.getFarmingCount(farmId);
 	}
 
 	/**
@@ -78,8 +94,8 @@
 	 * @return
 	 */
 	@Override
-	public Object getFarmingStatis(String deptId) {
-		return baseMapper.getFarmingStatis(deptId);
+	public Object getFarmingStatis(String farmId) {
+		return baseMapper.getFarmingStatis(farmId);
 	}
 
 	@Override
@@ -116,4 +132,9 @@
 	public List<FarmingRecordVO> getFarmingRecordListfarm(FarmingRecordVO farm) {
 		return baseMapper.getFarmingRecordListfarm(farm);
 	}
+
+	@Override
+	public FarmingRecordVO getDetails(FarmingRecordVO farmingRecordVO) {
+		return baseMapper.getDetails(farmingRecordVO);
+	}
 }

--
Gitblit v1.9.3