From d1e1caa4a066aa69acee64fda9296c46cff4d496 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 19 Aug 2022 15:58:25 +0800
Subject: [PATCH] 小程序记录农资退回
---
src/main/java/org/springblade/modules/lang/controller/LandController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/lang/controller/LandController.java b/src/main/java/org/springblade/modules/lang/controller/LandController.java
index 95f9d57..c78e810 100644
--- a/src/main/java/org/springblade/modules/lang/controller/LandController.java
+++ b/src/main/java/org/springblade/modules/lang/controller/LandController.java
@@ -30,6 +30,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.farm.entity.Farm;
import org.springblade.modules.farm.vo.FarmVO;
import org.springblade.modules.resource.endpoint.OssEndpoint;
@@ -117,11 +118,11 @@
}
/**
- * 根据品种id查询对应地块(农产品库存)
+ * 根据品种id查询对应地块(种养品种)
*/
@GetMapping("/getByStrainIdFarmId")
- public R getByStrainIdFarmId(String strainId,String farmId) {
- List<Land> list = landService.getByStrainIdFarmId(strainId,farmId);
+ public R getByStrainIdFarmId(LandVO land) {
+ List<Land> list = landService.getByStrainIdFarmId(land);
return R.data(list);
}
@@ -314,7 +315,13 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(landService.deleteLogic(Func.toLongList(ids)));
+ //先要判断该地块是否还有正在种植的作物，先结束才能删除地块
+ List<LandVO> land= landService.findPlantInLand(ids);
+ if (land.size()<=0) {
+ return R.status(landService.deleteLogic(Func.toLongList(ids)));
+ }else {
+ throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("请先结束该地块正在种养品种"));
+ }
}
/**
--
Gitblit v1.9.3