From c2ad2126d6f8423e0a5e6e20bbb91ef6bb1cffc0 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 13:26:27 +0800
Subject: [PATCH] fix(approve): 修复审批流程为空时的异常处理
---
src/main/resources/mapper/production/ProductProcessMapper.xml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessMapper.xml b/src/main/resources/mapper/production/ProductProcessMapper.xml
index 0ab44e7..a4283e8 100644
--- a/src/main/resources/mapper/production/ProductProcessMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessMapper.xml
@@ -33,9 +33,9 @@
order by pp.id asc
</select>
- <select id="calculateProductionStatistics" resultType="com.ruoyi.home.dto.processDataProductionStatisticsDto">
+ <select id="calculateProductionStatistics" resultType="com.ruoyi.home.dto.ProcessDataProductionStatisticsDto">
SELECT
- pp.name AS processName,
+ pp.type AS processType,
SUM(pi.quantity) AS totalInput,
SUM(distinct ppo.scrap_qty) AS totalScrap,
SUM(distinct (ppo.quantity - ppo.scrap_qty)) AS totalOutput
@@ -55,15 +55,14 @@
<if test="userId != null">
AND ppm.user_id = #{userId}
</if>
- <if test="processIds != null and processIds.size() > 0">
- AND pp.id IN
- <foreach collection="processIds" item="id" open="(" separator="," close=")">
+ <if test="processTypes != null and processTypes.size() > 0">
+ AND pp.type IN
+ <foreach collection="processTypes" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
</where>
GROUP BY
- pp.id,
- pp.name
+ pp.type
</select>
</mapper>
--
Gitblit v1.9.3