From da5aa91989a403f01ec9c621468f3bff0c6d4e47 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 09 Aug 2022 14:02:04 +0800
Subject: [PATCH] 添加批量结束种养接口
---
src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java | 1 +
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 2 +-
src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java | 26 ++++++++++++++++++++++++++
src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java | 1 +
4 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
index dd4cafb..bd5112a 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -244,6 +244,32 @@
return R.status(status);
}
+ @PostMapping("/overAll")
+ public R overAll(@RequestBody FarmPlantVO farmPlantVO){
+ boolean status = false;
+ for (int i=0;i<farmPlantVO.getIds().length;i++){
+ FarmPlant farmPlant = new FarmPlant();
+ farmPlant.setId(farmPlantVO.getIds()[i]);
+ farmPlant.setEndPlantTime(farmPlantVO.getEndPlantTime());
+ farmPlant.setStatus("2");
+ status = farmplantService.updateById(farmPlant);
+ //判断该地块是否还有种植的农产品
+ FarmPlant farmPlant2 = farmplantService.getById(farmPlant.getId());
+ FarmPlant farmPlant1 = new FarmPlant();
+ farmPlant1.setLandId(farmPlant2.getLandId());
+ farmPlant1.setStatus("1");
+ List<FarmPlant> list = farmplantService.list(new QueryWrapper<>(farmPlant1));
+ if (list.size() < 1) {
+ //更新该地块的耕种状态
+ Land land = new Land();
+ land.setType(1);
+ land.setId(Long.parseLong(farmPlant2.getLandId()));
+ landService.updateById(land);
+ }
+ }
+ return R.data(status);
+ }
+
/**
* 新增或修改
*/
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
index 45d5934..a0fda5d 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -64,7 +64,7 @@
<select id="selectFarmPlantPageCount" resultType="org.springblade.modules.farmplant.vo.FarmPlantVO">
SELECT
- a.strain_id,a.strainName,SUM(FORMAT(a.land_area,3)) area,a.url,a.tenant_id,a.dept_id
+ a.strain_id,a.strainName,SUM(TRUNCATE(a.land_area,3)) area,a.url,a.tenant_id,a.dept_id
FROM
(
SELECT
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 ebf33a1..f81a4b3 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
@@ -10,6 +10,7 @@
import org.springblade.modules.farmplant.vo.FarmPlantVO;
import org.springblade.modules.farmplant.vo.StrainVO;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.List;
diff --git a/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java b/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
index 35c1c4b..dd7fac1 100644
--- a/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
+++ b/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
@@ -81,4 +81,5 @@
*/
private String transplanTimeEnd;
+ private Long[] ids;
}
--
Gitblit v1.9.3