From 7abdd3ba7fa34c059f3c867e366d1a2137ae702f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 14 Jul 2022 17:08:24 +0800
Subject: [PATCH] kuc管理
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 6 ++++++
src/main/java/org/springblade/modules/stock/controller/StockController.java | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
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 7bc0c3f..e333f40 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -95,6 +95,9 @@
<if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
and sfp.tenant_id = #{farmPlant.tenantId}
</if>
+ <if test="farmPlant.status!=null and farmPlant.status!=''">
+ and sfp.status = #{farmPlant.status}
+ </if>
group by sfp.strain_id,strain_name,land_unit
</select>
@@ -301,6 +304,9 @@
<if test="farmPlant.deptId!=null and farmPlant.deptId!=''">
and sfp.dept_id = #{farmPlant.deptId}
</if>
+ <if test="farmPlant.status!=null and farmPlant.status!=''">
+ and sfp.status = #{farmPlant.status}
+ </if>
<if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
and sfp.tenant_id = #{farmPlant.tenantId}
</if>
diff --git a/src/main/java/org/springblade/modules/stock/controller/StockController.java b/src/main/java/org/springblade/modules/stock/controller/StockController.java
index 92806a5..29d331c 100644
--- a/src/main/java/org/springblade/modules/stock/controller/StockController.java
+++ b/src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -495,7 +495,7 @@
* @param query
* @return
*/
- @PostMapping("/pagenums")
+ @GetMapping("/pagenums")
public R pagenums(StocksVO stock, Query query) {
Double rknu = 0.0;
Double cknu = 0.0;
--
Gitblit v1.9.3