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 |   45 ++++++++++++++++++++++++++++++---------------
 1 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductProcessMapper.xml b/src/main/resources/mapper/production/ProductProcessMapper.xml
index f8ba285..a4283e8 100644
--- a/src/main/resources/mapper/production/ProductProcessMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessMapper.xml
@@ -4,31 +4,47 @@
 
     <select id="listPage" resultType="com.ruoyi.production.dto.ProductProcessDto">
         SELECT
-        *
+        pp.id,
+        pp.no,
+        pp.remark,
+        pp.salary_quota,
+        pp.is_quality,
+        pp.planner_id,
+        pp.planner_name,
+        pp.update_time,
+        pp.type,
+        p.product_name AS name,
+        pm.model AS productModel
         FROM
-        product_process p
+        product_process pp
+        left join product_model pm ON pm.id = pp.product_model_id
+        left join product p ON p.id = pm.product_id
         <where>
             <if test="productProcessDto.name != null and productProcessDto.name != '' ">
-                AND  p.name LIKE CONCAT('%',#{productProcessDto.name},'%')
+                AND p.product_name LIKE CONCAT('%',#{productProcessDto.name},'%')
             </if>
             <if test="productProcessDto.no != null and productProcessDto.no != '' ">
-                AND  p.no LIKE CONCAT('%',#{productProcessDto.no},'%')
+                AND pp.no LIKE CONCAT('%',#{productProcessDto.no},'%')
+            </if>
+            <if test="productProcessDto.type != null">
+                AND pp.type = #{productProcessDto.type}
             </if>
         </where>
-        order by p.id asc
+        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,
-        SUM((ppo.quantity + ppo.scrap_qty) * pp.salary_quota) AS totalInput,
-        SUM(ppo.scrap_qty * pp.salary_quota) AS totalScrap,
-        SUM(ppo.quantity * pp.salary_quota) AS totalOutput
+        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
         FROM
         production_product_output ppo
         INNER JOIN production_product_main ppm ON ppo.product_main_id = ppm.id
         INNER JOIN product_process_route_item ppri ON ppm.product_process_route_item_id = ppri.id
         INNER JOIN product_process pp ON ppri.process_id = pp.id
+        INNER JOIN production_product_input pi ON pi.product_main_id = ppm.id
         <where>
             <if test="startDateTime != null">
                 AND ppo.create_time &gt;= #{startDateTime}
@@ -39,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