From b9a422b6d3dcfb9b2e09f0dc4628425f6e9a45a9 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期五, 20 九月 2024 09:58:56 +0800 Subject: [PATCH] 2024-09-20 朱宝民 修改充值记录余额计算方法,修改今日明细余额计算方法 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml index ea0db3b..915a04f 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml @@ -173,7 +173,10 @@ from rm_intake_amount_day_last riadl Left join pr_intake pint on pint.id = riadl.intake_id <where> - <if test="intakeName != 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"> @@ -199,7 +202,10 @@ from rm_intake_amount_day_last riadl Left join pr_intake pint on pint.id = riadl.intake_id <where> - <if test="intakeName != 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"> -- Gitblit v1.8.0