From 3c18ab6cd51082eefdc1e3ef28751dd46db3faab Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 01 Jul 2022 10:22:18 +0800
Subject: [PATCH] 采收修改，农事记录设置租户id,溯源信息返回为二维码图片
---
src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 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..b550bd0 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
@@ -36,6 +36,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 +46,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 deptId) {
+ return baseMapper.getFarmingCount(deptId);
}
/**
@@ -60,7 +77,22 @@
* @return
*/
@Override
- public Object getFarmingStatis() {
- return baseMapper.getFarmingStatis();
+ public Object getFarmingStatis(String deptId) {
+ return baseMapper.getFarmingStatis(deptId);
+ }
+
+ @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);
}
}
--
Gitblit v1.9.3