From 939d5f3d5e17e5ca0bfeec9c23c7c926b4cb1684 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 10 九月 2024 15:47:33 +0800
Subject: [PATCH] plan rate

---
 pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
index 6d5d8a8..cf7ee7f 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
@@ -261,8 +261,8 @@
             <if test="endDate != null and endDate !=''">end_date,</if>
             <if test="deleted != null">deleted,</if>
             <if test="content != null and content !=''">content,</if>
-            <if test="inputNumber!= null and inputNumber !=''">input_number,</if>
-            <if test="outputNumber!= null and outputNumber !=''">output_number,</if>
+            <if test="inputNumber!= null">input_number,</if>
+            <if test="outputNumber!= null">output_number,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id,jdbcType=BIGINT},</if>
@@ -325,10 +325,10 @@
             <if test="content != null and content !=''">
                 content = #{content,jdbcType=VARCHAR},
             </if>
-            <if test="inputNumber!= null and inputNumber !=''">
+            <if test="inputNumber!= null">
                 input_number = #{inputNumber,jdbcType=INTEGER},
             </if>
-            <if test="outputNumber!= null and outputNumber !=''">
+            <if test="outputNumber!= null">
                 output_number = #{outputNumber,jdbcType=INTEGER},
             </if>
         </set>
@@ -423,6 +423,13 @@
         </if>
     </select>
 
+    <select id="queryPlanList" resultType="cn.hutool.json.JSONObject">
+        select pp.`name` as pro_name, p.`name` ,p.number, p.output_number, concat(round(((p.output_number/p.number) * 100 ),0), '%') as complete_rate ,p.end_date
+        from (SELECT * FROM pr_assembly_plan WHERE  STATUS = 1 and deleted = 0)  p
+        LEFT JOIN plt_product pp
+        on p.pro_id = pp.id
+        ORDER BY end_date
+    </select>
 
 
 </mapper>

--
Gitblit v1.8.0