From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 17 四月 2025 14:22:59 +0800 Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划,是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml index b177eb6..cf15a1f 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml @@ -337,10 +337,10 @@ SELECT COUNT(*) AS recordCount FROM se_card_operate ope - INNER JOIN se_client cli ON ope.client_id = cli.id - INNER JOIN se_client_card card ON card.id = ope.card_id - LEFT JOIN se_payment_method pay ON ope.payment_id = pay.id - INNER JOIN ba_user us ON ope.operator = us.id + LEFT JOIN se_client cli ON ope.client_id = cli.id + LEFT JOIN se_client_card card ON card.id = ope.card_id + LEFT JOIN se_payment_method pay ON ope.payment_id = pay.id + LEFT JOIN ba_user us ON ope.operator = us.id <where> AND ope.operate_type IN(1,2,3,5,10) AND ope.operate_valid = 2 -- Gitblit v1.8.0