From f32d0dfb10154007d6e51063b7567a604922a9f9 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 09 Jul 2022 18:34:16 +0800
Subject: [PATCH] 大屏接口对接
---
src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java | 1
src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java | 4 ++
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java | 1
src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java | 24 +++++++++--
src/main/java/org/springblade/modules/farmplant/entity/FarmProductStock.java | 6 ++
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml | 34 +++++++++++++++-
src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java | 6 +++
src/main/java/org/springblade/modules/sale/controller/SaleController.java | 1
8 files changed, 68 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
index 41c7ac5..1c039c1 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -173,16 +173,30 @@
map.put("jgsum",0);
//农产品年产量统计
- List<Map<String, Double>> Nsum = farmProductStockService.statisticsYield(year, deptId);
- double ncpNcl = Nsum.get(1).get("sum") + Nsum.get(0).get("sum");
- System.out.println("cscsc"+ncpNcl);
- System.out.println(map.get("sum"));
+// List<Map<String, Double>> Nsum = farmProductStockService.statisticsYield(year, deptId);
+// double ncpNcl = Nsum.get(1).get("sum") + Nsum.get(0).get("sum");
- map.put("ncpNcl",ncpNcl + Double.parseDouble(map.get("sum").toString()));
+ map.put("ncpNcl", sum.get("cssum"));
//加工产品年产量统计
map.put("jgNcl",0);
return R.data(map);
}
+
+ /**
+ * 按月份统计产量
+ */
+ @GetMapping("/statisticsStockMonth")
+ public R statisticsStockMonth(String year,String deptId) {
+
+ //采收数量统计
+ Map map = new HashMap();
+ Map<String, String> cssum = farmProductStockService.statisticsStockMonth(year, deptId);
+ //加工产品数量统计
+ Map<String, String> jgsum = null;
+
+ return R.data(cssum);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/farmplant/entity/FarmProductStock.java b/src/main/java/org/springblade/modules/farmplant/entity/FarmProductStock.java
index 7b5a45d..75e3ef6 100644
--- a/src/main/java/org/springblade/modules/farmplant/entity/FarmProductStock.java
+++ b/src/main/java/org/springblade/modules/farmplant/entity/FarmProductStock.java
@@ -34,9 +34,13 @@
private Integer strainId;
/**
- * 采收重量
+ * 库存重量
*/
private String weight;
+ /**
+ * 采收重量
+ */
+ private String recovery;
/**
* 产品等级（0：一等品 1：二等品 2：三等品 3：四等品4：五等品）
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
index cc2fd4b..d42ea21 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
@@ -35,6 +35,7 @@
List<FarmProductStockVO> statisticsProductx(@Param("page") IPage page, @Param("farmProductStock") FarmProductStockVO farmProductStock);
Map<String, String> selctProductCount(String year);
Map<String, String> statisticsStock(String year,String deptId);
+ Map<String, String> statisticsStockMonth(String year,String deptId);
List<Map<String, Double>> statisticsYield(String year,String deptId);
boolean stockCompare(double sale,String id);
boolean stockReduce(double sale,String id);
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
index 6ab39ff..0da03b4 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -68,10 +68,12 @@
<!--大屏经营概况库存数量统计-->
<select id="statisticsStock" resultType="java.util.HashMap">
SELECT
- SUM(stock.weight) AS sum
+ SUM( stock.weight ) AS sum ,
+ SUM( stock.recovery ) AS cssum
FROM
- sys_farm_product_stock as stock
- where 1 = 1
+ sys_farm_product_stock AS stock
+ WHERE
+ 1 = 1
<if test="year!=null and year!=''">
and YEAR ( stock.time ) = #{year}
</if>
@@ -79,6 +81,32 @@
and stock.dept_id = #{deptId}
</if>
</select>
+ <!--按月份统计产量-->
+ <select id="statisticsStockMonth" resultType="java.util.HashMap">
+ SELECT
+ IFNULL( SUM( CASE WHEN MONTH ( time ) = 1 THEN weight END ), 0 ) AS '1',
+ IFNULL( SUM( CASE WHEN MONTH ( time ) = 2 THEN weight END ), 0 ) AS '2',
+ IFNULL( SUM( CASE WHEN MONTH ( time ) = 3 THEN weight END ), 0 ) AS '3',
+ IFNULL( SUM( CASE WHEN MONTH ( time ) = 4 THEN weight END ), 0 ) AS '4',
+ IFNULL( SUM( CASE WHEN MONTH ( time ) = 5 THEN weight END ), 0 ) AS '5',
+ IFNULL( SUM( CASE WHEN MONTH ( time ) = 6 THEN weight END ), 0 ) AS '6',
+ IFNULL( SUM( CASE WHEN MONTH ( time ) = 7 THEN weight END ), 0 ) AS '7',
+ IFNULL( SUM( CASE WHEN MONTH ( time ) = 8 THEN weight END ), 0 ) AS '8',
+ IFNULL( SUM( CASE WHEN MONTH ( time ) = 9 THEN weight END ), 0 ) AS '9',
+ IFNULL( SUM( CASE WHEN MONTH ( time ) = 10 THEN weight END ), 0 ) AS '10',
+ IFNULL( SUM( CASE WHEN MONTH ( time ) = 11 THEN weight END ), 0 ) AS '11',
+ IFNULL( SUM( CASE WHEN MONTH ( time ) = 12 THEN weight END ), 0 ) AS '12'
+ FROM
+ sys_recovery
+ where
+ 1 = 1
+ <if test="year!=null and year!=''">
+ and YEAR ( time ) = #{year}
+ </if>
+ <if test="deptId!=null and deptId!=''">
+ and dept_id = #{deptId}
+ </if>
+ </select>
<!--大屏经营概况年产量统计-->
<select id="statisticsYield" resultType="java.util.HashMap">
SELECT
diff --git a/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java b/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java
index f6e3017..453fd78 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java
@@ -34,6 +34,7 @@
IPage<FarmProductStockVO> statisticsProductx(IPage<FarmProductStockVO> page, FarmProductStockVO farmProductStock);
Map<String, String> selctProductCount(String year);
Map<String, String> statisticsStock(String year,String deptId);
+ Map<String, String> statisticsStockMonth(String year,String deptId);
List<Map<String, Double>> statisticsYield(String year, String deptId);
//查看库存是否充足
boolean stockCompare(double sale,String id);
diff --git a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java
index 4841e0e..5780103 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java
@@ -66,6 +66,10 @@
return baseMapper.statisticsStock(year,deptId);
}
@Override
+ public Map<String, String> statisticsStockMonth(String year,String deptId) {
+ return baseMapper.statisticsStockMonth(year,deptId);
+ }
+ @Override
public List<Map<String, Double>> statisticsYield(String year,String deptId) {
return baseMapper.statisticsYield(year,deptId);
}
diff --git a/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java b/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
index ecfa279..9c2a4b8 100644
--- a/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
+++ b/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
@@ -124,6 +124,11 @@
double now = Double.parseDouble(recovery.getWeight());
double addNum = add(old, now);
stock1.setWeight(String.valueOf(addNum));
+
+ //总采收
+ double olds = Double.parseDouble(stock1.getRecovery());
+ double addNums = add(olds, now);
+ stock1.setRecovery(String.valueOf(addNums));
//更新
farmProductStockService.updateById(stock1);
} else {
@@ -135,6 +140,7 @@
productStock.setTime(recovery.getTime());
productStock.setStrainId(recovery.getStrainId());
productStock.setWeight(recovery.getWeight());
+ productStock.setRecovery(recovery.getWeight());
productStock.setFarmPlantId(recovery.getFarmPlantId());
productStock.setTenantId(recovery.getTenantId());
productStock.setDeptId(recovery.getDeptId());
diff --git a/src/main/java/org/springblade/modules/sale/controller/SaleController.java b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
index bc157cb..7c09149 100644
--- a/src/main/java/org/springblade/modules/sale/controller/SaleController.java
+++ b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
@@ -165,4 +165,5 @@
public R selectMarketDistrict() {
return R.data(saleService.selectMarketDistrict());
}
+
}
--
Gitblit v1.9.3