From 9ca97fd558700e7054c5f54192a9db7a1e6b8230 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 九月 2024 16:31:47 +0800
Subject: [PATCH] 完善导出等接口
---
ruoyi-system/src/main/resources/mapper/system/TOrderStockMapper.xml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TOrderStockMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOrderStockMapper.xml
index c11c696..cf4c8da 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TOrderStockMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TOrderStockMapper.xml
@@ -15,11 +15,12 @@
<result column="isCover" property="isCover" />
<result column="shopId" property="shopId" />
<result column="generatorId" property="generatorId" />
+ <result column="stockTotalPrice" property="stockTotalPrice" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, stockNum, stockTime, createTime, updateTime, disabled, createBy, updateBy,isCover,shopId,generatorId
+ id, stockNum, stockTime, createTime, updateTime, disabled, createBy, updateBy,isCover,shopId,generatorId,stockTotalPrice
</sql>
<select id="pageList" resultType="com.ruoyi.system.vo.TOrderStockVO">
SELECT <include refid="Base_Column_List"></include>
@@ -43,12 +44,12 @@
</select>
<select id="getDataGeneratorStockDetail" resultType="java.util.Map">
SELECT
- SUM(payMoney) AS stockAmountSum,
+ IFNULL(SUM(stockTotalPrice),0) AS stockAmountSum,
COUNT(id) AS totalStock
from t_order_stock
<where>
- <if test="query.stockNum != null and query.stockNum != ''">
- AND stockNum LIKE concat('%',#{query.stockNum},'%')
+ <if test="query.orderNum != null and query.orderNum != ''">
+ AND stockNum LIKE concat('%',#{query.orderNum},'%')
</if>
<if test="query.generatorId != null">
AND generatorId = #{query.generatorId}
@@ -63,8 +64,8 @@
SELECT <include refid="Base_Column_List"></include>
FROM t_order_stock
<where>
- <if test="query.stockNum != null and query.stockNum != ''">
- AND stockNum LIKE concat('%',#{query.stockNum},'%')
+ <if test="query.orderNum != null and query.orderNum != ''">
+ AND stockNum LIKE concat('%',#{query.orderNum},'%')
</if>
<if test="query.generatorId != null">
AND generatorId = #{query.generatorId}
--
Gitblit v1.7.1