From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:04:56 +0800
Subject: [PATCH] 大屏溯源统计次数sql修改
---
src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 61 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 7e6f953..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
@@ -6,6 +6,7 @@
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.recovery.vo.RecoveryVO;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.service.IDictBizService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,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->{
@@ -68,8 +85,8 @@
* @return
*/
@Override
- public Object getFarmingCount() {
- return baseMapper.getFarmingCount();
+ public Object getFarmingCount(String farmId) {
+ return baseMapper.getFarmingCount(farmId);
}
/**
@@ -77,7 +94,47 @@
* @return
*/
@Override
- public Object getFarmingStatis() {
- return baseMapper.getFarmingStatis();
+ public Object getFarmingStatis(String farmId) {
+ return baseMapper.getFarmingStatis(farmId);
+ }
+
+ @Override
+ public Double selectJyCount(String deptId) {
+ return baseMapper.selectJyCount(deptId);
+ }
+
+ @Override
+ public Double selectQyCount(String deptId) {
+ return baseMapper.selectQyCount(deptId);
+ }
+
+ @Override
+ public Double selectByCount(String deptId) {
+ return baseMapper.selectByCount(deptId);
+ }
+
+ /**
+ * 查询农事记录信息(种植开始起)
+ * @param recoveryVO 采收信息
+ * @return
+ */
+ @Override
+ public List<FarmingRecordVO> getFarmingRecordByFarmPlantId(RecoveryVO recoveryVO) {
+ return baseMapper.getFarmingRecordByFarmPlantId(recoveryVO);
+ }
+
+ /**
+ * 查询农事操作记录（不分页）
+ * @param farm
+ * @return
+ */
+ @Override
+ public List<FarmingRecordVO> getFarmingRecordListfarm(FarmingRecordVO farm) {
+ return baseMapper.getFarmingRecordListfarm(farm);
+ }
+
+ @Override
+ public FarmingRecordVO getDetails(FarmingRecordVO farmingRecordVO) {
+ return baseMapper.getDetails(farmingRecordVO);
}
}
--
Gitblit v1.9.3