From e71881a6ade967e45ba62b802028e2a2d2dfdee0 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 15 Jun 2022 18:05:07 +0800
Subject: [PATCH] 农资库存管理

---
 src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 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 5379154..20eb127 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
@@ -1,11 +1,17 @@
 package org.springblade.modules.farm.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.modules.farm.entity.FarmingRecord;
 import org.springblade.modules.farm.mapper.FarmingRecordMapper;
 import org.springblade.modules.farm.service.FarmingRecordService;
 import org.springblade.modules.farm.vo.FarmingRecordVO;
+import org.springblade.modules.system.entity.DictBiz;
+import org.springblade.modules.system.service.IDictBizService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 农事记录服务实现类
@@ -15,6 +21,9 @@
 @Service
 public class FarmRecordServiceImpl extends ServiceImpl<FarmingRecordMapper, FarmingRecord> implements FarmingRecordService {
 
+	@Autowired
+	private IDictBizService dictBizService;
+
 	/**
 	 * 自定义分页
 	 * @param page
@@ -23,7 +32,18 @@
 	 */
 	@Override
 	public IPage<FarmingRecordVO> selectFarmingRecordPage(IPage<FarmingRecordVO> page, FarmingRecordVO farm) {
-		return page.setRecords(baseMapper.selectFarmingRecordPage(page, farm));
+		List<FarmingRecordVO> recordVOS = baseMapper.selectFarmingRecordPage(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);
 	}
 
 

--
Gitblit v1.9.3