From e49b4ed39fa32266ca89e3eaeeeec1f78c42d4b3 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 11 十一月 2024 14:27:05 +0800
Subject: [PATCH] 工单任务类型自动初始化

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
index bdf5d9a..c295ea9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -155,11 +155,14 @@
     from rm_loss_day rld
     Left join pr_intake pint on pint.id = rld.intake_id
     <where>
-      <if test="intakeName != null">
+      <if test="intakeId != null and intakeId != '' ">
+        and rld.intake_id = #{intakeId}
+      </if>
+      <if test="intakeName != null and intakeName != '' ">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
-      <if test="intakeId != null">
-        and rld.intake_id = #{intakeId}
+      <if test="lossAmountGreaterOrEqual != null ">
+        and rld.loss_amount  &gt;= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
       </if>
       <if test="startDt != null">
         and rld.dt &gt;= #{startDt,jdbcType=DATE}
@@ -183,11 +186,14 @@
     from rm_loss_day rld
     Left join pr_intake pint on pint.id = rld.intake_id
     <where>
-      <if test="intakeName != null">
+      <if test="intakeId != null and intakeId != '' ">
+        and rld.intake_id = #{intakeId}
+      </if>
+      <if test="intakeName != null and intakeName != '' ">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
-      <if test="intakeId != null">
-        and rld.intake_id = #{intakeId}
+      <if test="lossAmountGreaterOrEqual != null ">
+        and rld.loss_amount  &gt;= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
       </if>
       <if test="startDt != null">
         and rld.dt &gt;= #{startDt,jdbcType=DATE}
@@ -196,10 +202,12 @@
         and rld.dt &lt;= #{endDt,jdbcType=DATE}
       </if>
     </where>
-    ORDER BY rld.dt DESC , rld.loss_amount DESC
-    <if test="pageCurr != null and pageSize != null">
-      LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
-    </if>
+    ORDER BY rld.id DESC
+    <trim prefix="limit " >
+      <if test="start != null and count != null">
+        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+      </if>
+    </trim>
   </select>
 
   <select id="statisticsByIntake" resultType="com.dy.pipIrrGlobal.voSt.VoIntakeLossStatistics">

--
Gitblit v1.8.0