From fabe7ee6a486b08d07b681f0e081c87c828878f2 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 15 Jul 2022 14:27:16 +0800
Subject: [PATCH] 连接地址修改
---
src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java | 10 ++++++++--
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml | 1 +
src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml | 1 +
3 files changed, 10 insertions(+), 2 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 578a634..a8b1040 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -180,14 +180,20 @@
Map<String, String> sum = farmProductStockService.statisticsStock(year, farmId);
//统计当前库存加工产品
Map<String, String> jgsum = null;
- map.put("sum",sum.get("sum"));
+ if (sum != null){
+ map.put("sum",sum.get("sum"));
+ map.put("ncpNcl", sum.get("cssum"));
+ }else{
+ map.put("sum",0);
+ map.put("ncpNcl",0);
+ }
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");
- map.put("ncpNcl", sum.get("cssum"));
+
//加工产品年产量统计
map.put("jgNcl",0);
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 b5c0e40..1afaf51 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -252,6 +252,7 @@
GROUP BY
gptime
) AS righttable ON DATE_FORMAT( lefttable.date, '%Y-%c-%d' ) = righttable.gptime
+ ORDER BY time
</select>
<!--按日统计产量-->
<select id="statisticsStockDay" resultType="java.util.HashMap">
diff --git a/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml b/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml
index 6bd394b..95cb535 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml
@@ -170,6 +170,7 @@
and sl.farm_id = #{sweepRecord.farmId}
GROUP BY gptime
) AS righttable ON DATE_FORMAT(lefttable.date, '%Y-%c-%d') = righttable.gptime
+ ORDER BY time
</select>
<!--获取扫描次数统计数据（年统计）-->
--
Gitblit v1.9.3