From 1e159ffbf027d1c8a2de5a92ff257d3b02411415 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 06 Aug 2022 16:50:11 +0800
Subject: [PATCH] 修复使用农资后，已出库待使用农资数据不变。修复使用农资后还能删除出库数据
---
src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 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 fbc4b11..5372ebc 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
@@ -106,4 +122,14 @@
public List<FarmingRecordVO> getFarmingRecordByFarmPlantId(RecoveryVO recoveryVO) {
return baseMapper.getFarmingRecordByFarmPlantId(recoveryVO);
}
+
+ /**
+ * 查询农事操作记录（不分页）
+ * @param farm
+ * @return
+ */
+ @Override
+ public List<FarmingRecordVO> getFarmingRecordListfarm(FarmingRecordVO farm) {
+ return baseMapper.getFarmingRecordListfarm(farm);
+ }
}
--
Gitblit v1.9.3