From 7d5efc462523c0fa48f438d0553e626827f149ff Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期五, 09 八月 2024 15:28:21 +0800 Subject: [PATCH] 指定时间段内物理卡充值金额超过指定值的农户 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 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 6c10de8..f1dcebb 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,11 @@ from rm_loss_day rld Left join pr_intake pint on pint.id = rld.intake_id <where> - <if test="intakeName != null"> - and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') - </if> - <if test="intakeId != null"> + <if test="intakeId != null and intakeId != '' "> and rash.intake_id = #{intakeId} + </if> + <if test="intakeName != null and intakeName != '' "> + and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') </if> <if test="startDt != null"> and rld.dt >= #{startDt,jdbcType=DATE} @@ -183,11 +183,11 @@ from rm_loss_day rld Left join pr_intake pint on pint.id = rld.intake_id <where> - <if test="intakeName != null"> - and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') - </if> - <if test="intakeId != null"> + <if test="intakeId != null and intakeId != '' "> and rash.intake_id = #{intakeId} + </if> + <if test="intakeName != null and intakeName != '' "> + and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') </if> <if test="startDt != null"> and rld.dt >= #{startDt,jdbcType=DATE} @@ -196,7 +196,7 @@ and rld.dt <= #{endDt,jdbcType=DATE} </if> </where> - ORDER BY rld.id DESC + ORDER BY rld.dt DESC , rld.loss_amount DESC <if test="pageCurr != null and pageSize != null"> LIMIT ${(pageCurr-1)*pageSize}, ${pageSize} </if> -- Gitblit v1.8.0