From 7cf7acab8660fe629056df3ed7c0f90dc2dcb1f8 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 09 七月 2024 17:13:14 +0800
Subject: [PATCH] 灌溉单元新增取水口ID字段，并修改相应的代码和接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 00047cf..b39aad5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -240,7 +240,7 @@
INNER JOIN ba_user us ON ope.operator = us.id
Left JOIN se_payment_method pay ON ope.payment_id = pay.id
<where>
- AND ope.operate_type in(2, 5)
+ AND ope.operate_type in(1, 2, 5)
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
@@ -274,10 +274,11 @@
cli.clientNum,
cli.address,
card.money,
- CASE
- WHEN card.cardNum LIKE '10%' THEN CONCAT(SUBSTRING(card.cardNum, 7, 6),SUBSTRING(card.cardNum, 14, 4))
- ELSE card.cardNum
- END AS cardNum,
+ cardNum,
+<!-- CASE-->
+<!-- WHEN card.cardNum LIKE '10%' THEN CONCAT(SUBSTRING(card.cardNum, 7, 6),SUBSTRING(card.cardNum, 14, 4))-->
+<!-- ELSE card.cardNum-->
+<!-- END AS cardNum,-->
IFNULL(ope.card_cost,0) AS cardCost,
IFNULL(ope.trade_amount, 0) AS amount,
IFNULL(ope.refund_amount, 0) AS refundAmount,
--
Gitblit v1.8.0