From d95f6551e8214d69cd0fd511ec693641eb61ba16 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Aug 2022 10:36:26 +0800
Subject: [PATCH] 1、大屏首页接口修复，解决double类型相加精度问题
---
src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 57 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 baa461a..eb4c36b 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;
@@ -36,6 +37,7 @@
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));
@@ -45,14 +47,30 @@
return page.setRecords(recordVOS);
}
+ @Override
+ public List<FarmingRecordVO> selectFarmingRecordPages(FarmingRecordVO farm) {
+ List<FarmingRecordVO> farmingRecordVOS = baseMapper.selectFarmingRecordPages(farm);
+ farmingRecordVOS.forEach(recordVO->{
+ //查询字典对应的名称
+ DictBiz dictBiz = new DictBiz();
+ dictBiz.setTenantId(recordVO.getTenantId());
+ dictBiz.setCode("farmingType");
+ dictBiz.setDictKey(recordVO.getType());
+ DictBiz one = dictBizService.getOne(new QueryWrapper<>(dictBiz));
+ //设置名称
+ recordVO.setTypeName(one.getDictValue());
+ });
+ return farmingRecordVOS;
+ }
+
/**
* 查询统计本年农事记录操作总数
* @return
*/
@Override
- public Object getFarmingCount() {
- return baseMapper.getFarmingCount();
+ public Object getFarmingCount(String farmId) {
+ return baseMapper.getFarmingCount(farmId);
}
/**
@@ -60,7 +78,42 @@
* @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);
}
}
--
Gitblit v1.9.3