From 62084735c1f5d6b6d4771aadf4d9241479a4d4ee Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 24 Oct 2022 15:06:16 +0800
Subject: [PATCH] 用户查询增加模糊查询；修复当编辑用户时账号解封的问题；全景管理查询未删除的数据；当性别，生日未填时数据库同时也录入数据
---
src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java
index 630f043..6ef4128 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java
@@ -41,10 +41,10 @@
if (farmPlantVO.getLandUnit().equals("0")) {
farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 1));
}
- if (farmPlantVO.getLandUnit().equals("1")) {
+ else if (farmPlantVO.getLandUnit().equals("1")) {
farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 0.1));
}
- if (farmPlantVO.getLandUnit().equals("2")) {
+ else if (farmPlantVO.getLandUnit().equals("2")) {
farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 0.0015));
}
});
@@ -54,6 +54,11 @@
@Override
public IPage<FarmPlantVO> selectFarmPlantPageCount(IPage<Object> page, FarmPlantVO farmPlant) {
return baseMapper.selectFarmPlantPageCount(page, farmPlant);
+ }
+
+ @Override
+ public IPage<FarmPlantVO> selectFarmPlantPageCountYM(IPage<Object> page, FarmPlantVO farmPlant) {
+ return baseMapper.selectFarmPlantPageCountYM(page, farmPlant);
}
@Override
@@ -203,4 +208,9 @@
public List<FarmPlantVO> getFarmPlantList(FarmPlantVO farmPlant) {
return baseMapper.getFarmPlantList(farmPlant);
}
+
+ @Override
+ public List<FarmPlantVO> getFarmPlantYMList(FarmPlantVO farmPlant) {
+ return baseMapper.getFarmPlantYMList(farmPlant);
+ }
}
--
Gitblit v1.9.3