From 1976d790db5d2230e0e74662701b71b6740b3b20 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 14 Jun 2022 12:00:11 +0800
Subject: [PATCH] 农资库存管理
---
src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java | 4
src/main/java/org/springblade/modules/lang/mapper/LandMapper.java | 8 +-
src/main/java/org/springblade/modules/stock/entity/Stock.java | 68 ++++++++++++----------
src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java | 16 ++--
src/main/java/org/springblade/modules/stock/service/IStockService.java | 2
src/main/java/org/springblade/modules/lang/controller/LandController.java | 18 +++---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 8 +-
src/main/java/org/springblade/modules/stock/mapper/StockMapper.java | 2
src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml | 2
src/main/java/org/springblade/modules/lang/service/ILandService.java | 8 +-
src/main/java/org/springblade/modules/stock/controller/StockController.java | 6 +-
11 files changed, 73 insertions(+), 69 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 ccdd422..05e6cc9 100644
--- a/src/main/java/org/springblade/modules/lang/controller/LandController.java
+++ b/src/main/java/org/springblade/modules/lang/controller/LandController.java
@@ -228,10 +228,10 @@
* 首页地块统计接口
*/
@GetMapping("/selectCount")
- public R selectCount() {
- List<Map<String, Object>> list = landService.selectZAre();
- List<Map<String, Object>> lists = landService.selectSAre();
- List list1 = landService.selectNum();
+ public R selectCount(String deptId) {
+ List<Map<String, Object>> list = landService.selectZAre(deptId);
+ List<Map<String, Object>> lists = landService.selectSAre(deptId);
+ List list1 = landService.selectNum(deptId);
//总面积
Double num = 0.0;
for (int i = 0; i < list.size(); i++) {
@@ -300,11 +300,11 @@
* 大屏地块统计接口
*/
@GetMapping("/selectXCount")
- public R selectXCount() {
- List<Map<String, Object>> list = landService.selectZAre();
- List<Map<String, Object>> lists = landService.selectSAre();
- List<Map<String, Object>> listw = landService.selectWAre();
- List list1 = landService.selectNum();
+ public R selectXCount(String deptId) {
+ List<Map<String, Object>> list = landService.selectZAre(deptId);
+ List<Map<String, Object>> lists = landService.selectSAre(deptId);
+ List<Map<String, Object>> listw = landService.selectWAre(deptId);
+ List list1 = landService.selectNum(deptId);
//总面积
Double num = 0.0;
for (int i = 0; i < list.size(); i++) {
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
index 292592c..6d1818c 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
@@ -55,8 +55,8 @@
*/
int updateLandById(@Param("land") Land land);
List selectLandList(String userid);
- List selectNum();
- List<Map<String, Object>> selectZAre();
- List<Map<String, Object>> selectSAre();
- List<Map<String, Object>> selectWAre();
+ List selectNum(String deptId);
+ List<Map<String, Object>> selectZAre(String deptId);
+ List<Map<String, Object>> selectSAre(String deptId);
+ List<Map<String, Object>> selectWAre(String deptId);
}
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
index 4bce6d7..57558d9 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -90,26 +90,26 @@
<select id="selectZAre" resultType="java.util.HashMap">
SELECT IFNULL(land_area, 0) as area, IFNULL(land_unit, 0) as unit
FROM sys_land
- WHERE is_deleted = 0
+ WHERE is_deleted = 0 and dept_id=#{deprId}
</select>
<!--土地使用面积-->
<select id="selectSAre" resultType="java.util.HashMap">
SELECT IFNULL(land_area, 0) as area, IFNULL(land_unit, 0) as unit
FROM sys_land
WHERE is_deleted = 0
- and type = 0
+ and type = 0 and dept_id=#{deprId}
</select>
<!--土地未使用面积-->
<select id="selectWAre" resultType="java.util.HashMap">
SELECT IFNULL(land_area, 0) as area, IFNULL(land_unit, 0) as unit
FROM sys_land
WHERE is_deleted = 0
- and type = 1
+ and type = 1 and dept_id=#{deprId}
</select>
<select id="selectNum" resultType="java.util.HashMap">
SELECT strain_id
FROM `sys_farm_plant`
- WHERE status = 1
+ WHERE status = 1 and dept_id=#{deprId}
GROUP BY strain_id
</select>
diff --git a/src/main/java/org/springblade/modules/lang/service/ILandService.java b/src/main/java/org/springblade/modules/lang/service/ILandService.java
index c452523..d87ad52 100644
--- a/src/main/java/org/springblade/modules/lang/service/ILandService.java
+++ b/src/main/java/org/springblade/modules/lang/service/ILandService.java
@@ -66,8 +66,8 @@
* 土地总面积
* @return
*/
- List<Map<String, Object>> selectZAre();
- List<Map<String, Object>> selectSAre();
- List<Map<String, Object>> selectWAre();
- List selectNum();
+ List<Map<String, Object>> selectZAre(String deptId);
+ List<Map<String, Object>> selectSAre(String deptId);
+ List<Map<String, Object>> selectWAre(String deptId);
+ List selectNum(String deptId);
}
diff --git a/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java b/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java
index 5355265..adf3e99 100644
--- a/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java
+++ b/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java
@@ -66,23 +66,23 @@
}
@Override
- public List<Map<String, Object>> selectZAre() {
- return baseMapper.selectZAre();
+ public List<Map<String, Object>> selectZAre(String deptId) {
+ return baseMapper.selectZAre(deptId);
}
@Override
- public List<Map<String, Object>> selectSAre() {
- return baseMapper.selectSAre();
+ public List<Map<String, Object>> selectSAre(String deptId) {
+ return baseMapper.selectSAre(deptId);
}
@Override
- public List<Map<String, Object>> selectWAre() {
- return baseMapper.selectWAre();
+ public List<Map<String, Object>> selectWAre(String deptId) {
+ return baseMapper.selectWAre(deptId);
}
@Override
- public List selectNum() {
- return baseMapper.selectNum();
+ public List selectNum(String deptId) {
+ return baseMapper.selectNum(deptId);
}
}
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 2743915..4e6034d 100644
--- a/src/main/java/org/springblade/modules/stock/controller/StockController.java
+++ b/src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -233,9 +233,9 @@
*
* @return
*/
- @PostMapping("/StockCount")
- public R StockCount() {
- List<Map<String, Object>> maps = stockService.StockCount();
+ @GetMapping("/StockCount")
+ public R StockCount(String detpId) {
+ List<Map<String, Object>> maps = stockService.StockCount(detpId);
//化肥0
double hf = 0;
//有机肥1
diff --git a/src/main/java/org/springblade/modules/stock/entity/Stock.java b/src/main/java/org/springblade/modules/stock/entity/Stock.java
index d1b4f8d..4de12bd 100644
--- a/src/main/java/org/springblade/modules/stock/entity/Stock.java
+++ b/src/main/java/org/springblade/modules/stock/entity/Stock.java
@@ -17,6 +17,7 @@
package org.springblade.modules.stock.entity;
import com.baomidou.mybatisplus.annotation.TableName;
+
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
@@ -43,49 +44,52 @@
private static final long serialVersionUID = 1L;
/**
- * 农资ID
- */
+ * 农资ID
+ */
private String stockId;
/**
- * 规格
- */
- private String specs;
+ * 规格
+ */
+ private String specs;
/**
- * 规格值（0：克 1：斤 2：公斤 3：吨 4：毫升 5：升 ）
- */
- private Integer specsValue1;
+ * 规格值（0：克 1：斤 2：公斤 3：吨 4：毫升 5：升 ）
+ */
+ private Integer specsValue1;
/**
- * 规格值2( 0:袋 1：包 2：瓶 3：盒 4：箱 5：桶 6:支)
- */
- private Integer specsValue2;
+ * 规格值2( 0:袋 1：包 2：瓶 3：盒 4：箱 5：桶 6:支)
+ */
+ private Integer specsValue2;
/**
- * 入库数量
- */
- private Integer amount;
+ * 入库数量
+ */
+ private Integer amount;
/**
- * 类型 （0：采购入库 1：调拨入库）
- */
- private String type;
+ * 类型 （0：采购入库 1：调拨入库）
+ */
+ private String type;
/**
- * 入库时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ * 入库时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date time;
/**
- * 图片
- */
- private String picture;
+ * 图片
+ */
+ private String picture;
/**
- * 备注
- */
- private String remarks;
+ * 备注
+ */
+ private String remarks;
/**
- * 状态 （0：有库存 1：没有库存）
- */
- private String state;
- private String sp1;
- private String sp2;
-
+ * 状态 （0：有库存 1：没有库存）
+ */
+ private String state;
+ private String sp1;
+ private String sp2;
+ /**
+ * 部门id
+ */
+ private String deptId;
}
diff --git a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.java b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.java
index 9803588..d681fe8 100644
--- a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.java
+++ b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.java
@@ -54,5 +54,5 @@
List<StocksVO> slectNumx(String startTime, String endTime);
- List<Map<String, Object>> StockCount();
+ List<Map<String, Object>> StockCount(String deptId);
}
diff --git a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
index a6da746..41b1581 100644
--- a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
+++ b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
@@ -175,7 +175,7 @@
sto.type
FROM `sys_stock` st
LEFT JOIN (SELECT id, type FROM sys_stockfactory) sto ON st.stock_id = sto.id
- WHERE st.is_deleted = 0
+ WHERE st.is_deleted = 0 and dept_id=#{deptId}
</select>
<!--小程序数据统计-->
diff --git a/src/main/java/org/springblade/modules/stock/service/IStockService.java b/src/main/java/org/springblade/modules/stock/service/IStockService.java
index 5a1d971..cd11b4f 100644
--- a/src/main/java/org/springblade/modules/stock/service/IStockService.java
+++ b/src/main/java/org/springblade/modules/stock/service/IStockService.java
@@ -47,5 +47,5 @@
boolean Updaet(Stock stock);
IPage<StocksVO> slectNum(IPage<StocksVO> page, StocksVO stock);
List<StocksVO> slectNumx(String startTime, String endTime);
- List<Map<String, Object>> StockCount();
+ List<Map<String, Object>> StockCount(String deptId);
}
diff --git a/src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java b/src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java
index 213d94a..2b423bd 100644
--- a/src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java
+++ b/src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java
@@ -78,8 +78,8 @@
}
@Override
- public List<Map<String, Object>> StockCount() {
- return baseMapper.StockCount();
+ public List<Map<String, Object>> StockCount(String deptId) {
+ return baseMapper.StockCount(deptId);
}
--
Gitblit v1.9.3