From d95f6551e8214d69cd0fd511ec693641eb61ba16 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Aug 2022 10:36:26 +0800
Subject: [PATCH] 1、大屏首页接口修复，解决double类型相加精度问题
---
src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml | 64 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 29 deletions(-)
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 a74508d..9f1cf3b 100644
--- a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
+++ b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
@@ -26,9 +26,7 @@
<select id="selectStockPage" resultMap="stockResultMap">
- select *
- from sys_stock
- where is_deleted = 0
+ select * from sys_stock where is_deleted = 0
</select>
<select id="selectLists" resultType="org.springblade.modules.stock.vo.StockVO">
@@ -62,6 +60,9 @@
</if>
<if test="stock.specsValue1!=null and stock.specsValue1 != ''">
and st.specs_value1 = #{stock.specsValue1}
+ </if>
+ <if test="stock.year!=null and stock.year != ''">
+ and st.create_time like concat('%',#{stock.year},'%')
</if>
<if test="stock.specsValue2!=null and stock.specsValue2 != ''">
and st.specs_value2 = #{stock.specsValue2}
@@ -139,33 +140,38 @@
<select id="slectNum" resultType="org.springblade.modules.stock.vo.StocksVO">
SELECT id,
- a.agricultural_name as agrname,
- a.factory_name as facname,
- IFNULL(cg.cgnum, 0) AS cgnum,
- IFNULL(dbr.dbrknum, 0) AS dbrknum,
- IFNULL(lyc.lycknum, 0) AS lycknum,
- IFNULL(dbc.dbcknum, 0) AS dbcknum,
- IFNULL(bfc.bfcknum, 0) AS bfcknum
+ a.agricultural_name as agrname,
+ a.factory_name as facname,
+ IFNULL(cg.cgnum, 0) AS cgnum,
+ IFNULL(dbr.dbrknum, 0) AS dbrknum,
+ IFNULL(lyc.lycknum, 0) AS lycknum,
+ IFNULL(dbc.dbcknum, 0) AS dbcknum,
+ IFNULL(bfc.bfcknum, 0) AS bfcknum
FROM (
- SELECT stf.id,
- stf.agricultural_name,
- stf.factory_name
- FROM sys_stockrecord st
- LEFT JOIN (SELECT id, agricultural_name, factory_name FROM sys_stockfactory) stf
- ON st.stock_id1 = stf.id
- GROUP BY stf.id,
- stf.agricultural_name,
- stf.factory_name
+ SELECT stf.id,
+ stf.agricultural_name,
+ stf.factory_name
+ FROM
+ sys_stockrecord st
+ LEFT JOIN (SELECT id, agricultural_name, factory_name,type FROM sys_stockfactory) stf
+ ON st.stock_id1 = stf.id
+ <if test="stock.stockType !=null and stock.stockType != '' ">
+ WHERE stf.type =#{stock.stockType}
+ </if>
+ GROUP BY
+ stf.id,
+ stf.agricultural_name,
+ stf.factory_name
) a
LEFT JOIN (SELECT stock_id1, SUM(census) AS cgnum
FROM sys_stockrecord
WHERE stock_type1 = 1
AND type1 = 0
<if test="stock.startTime!=null and stock.startTime!=''">
- and DATE_FORMAT(time1,'%Y-%m-%d') >= #{stock.startTime}
+ and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') >= #{stock.startTime}
</if>
<if test="stock.endTime!=null and stock.endTime!=''">
- and DATE_FORMAT(time1,'%Y-%m-%d') <= #{stock.endTime}
+ and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') <= #{stock.endTime}
</if>
<if test="stock.deptId!=null and stock.deptId!=''">
and dept_id = #{stock.deptId}
@@ -176,10 +182,10 @@
WHERE stock_type1 = 1
AND type1 = 1
<if test="stock.startTime!=null and stock.startTime!=''">
- and DATE_FORMAT(time1,'%Y-%m-%d') >= #{stock.startTime}
+ and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') >= #{stock.startTime}
</if>
<if test="stock.endTime!=null and stock.endTime!=''">
- and DATE_FORMAT(time1,'%Y-%m-%d') <= #{stock.endTime}
+ and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') <= #{stock.endTime}
</if>
<if test="stock.deptId!=null and stock.deptId!=''">
and dept_id = #{stock.deptId}
@@ -190,10 +196,10 @@
WHERE stock_type1 = 0
AND type1 = 0
<if test="stock.startTime!=null and stock.startTime!=''">
- and DATE_FORMAT(time1,'%Y-%m-%d') >= #{stock.startTime}
+ and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') >= #{stock.startTime}
</if>
<if test="stock.endTime!=null and stock.endTime!=''">
- and DATE_FORMAT(time1,'%Y-%m-%d') <= #{stock.endTime}
+ and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') <= #{stock.endTime}
</if>
<if test="stock.deptId!=null and stock.deptId!=''">
and dept_id = #{stock.deptId}
@@ -204,10 +210,10 @@
WHERE stock_type1 = 0
AND type1 = 1
<if test="stock.startTime!=null and stock.startTime!=''">
- and DATE_FORMAT(time1,'%Y-%m-%d') >= #{stock.startTime}
+ and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') >= #{stock.startTime}
</if>
<if test="stock.endTime!=null and stock.endTime!=''">
- and DATE_FORMAT(time1,'%Y-%m-%d') <= #{stock.endTime}
+ and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') <= #{stock.endTime}
</if>
<if test="stock.deptId!=null and stock.deptId!=''">
and dept_id = #{stock.deptId}
@@ -218,10 +224,10 @@
WHERE stock_type1 = 0
AND type1 = 2
<if test="stock.startTime!=null and stock.startTime!=''">
- and DATE_FORMAT(time1,'%Y-%m-%d') >= #{stock.startTime}
+ and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') >= #{stock.startTime}
</if>
<if test="stock.endTime!=null and stock.endTime!=''">
- and DATE_FORMAT(time1,'%Y-%m-%d') <= #{stock.endTime}
+ and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') <= #{stock.endTime}
</if>
<if test="stock.deptId!=null and stock.deptId!=''">
and dept_id = #{stock.deptId}
--
Gitblit v1.9.3