pipIrr-SV.git - Gitblit

			@@ -251,7 +251,7 @@
			LEFT 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(1, 2, 5)
			AND ope.operate_type in(1, 2, 5,10)
			AND ope.operate_valid = 2
			<if test = "clientName != null and clientName !=''">
			AND cli.name like CONCAT('%',#{clientName},'%')
			@@ -300,6 +300,7 @@
			WHEN ope.operate_type = 1 THEN '开卡'
			WHEN ope.operate_type = 2 THEN '充值'
			WHEN ope.operate_type = 5 THEN '返还'
			WHEN ope.operate_type = 10 THEN '反写'
			END) AS operateType,
			ope.operate_dt
			FROM se_card_operate ope
			@@ -309,7 +310,7 @@
			LEFT 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(1, 2, 5)
			AND ope.operate_type in(1, 2, 5,10)
			AND ope.operate_valid = 2
			<if test = "clientName != null and clientName !=''">
			AND cli.name like CONCAT('%',#{clientName},'%')
			@@ -341,7 +342,7 @@
			LEFT JOIN se_payment_method pay ON ope.payment_id = pay.id
			INNER JOIN ba_user us ON ope.operator = us.id
			<where>
			AND ope.operate_type IN(1,2,3,5)
			AND ope.operate_type IN(1,2,3,5,10)
			AND ope.operate_valid = 2
			<if test = "villageId != null and villageId > 0">
			AND cli.villageId = #{villageId}
			@@ -371,6 +372,7 @@
			WHEN 2 THEN '充值'
			WHEN 3 THEN '销卡'
			WHEN 5 THEN '补扣'
			WHEN 10 THEN '反写'
			END) AS operateType,
			(IFNULL(ope.trade_amount,0.00) + IFNULL(ope.card_cost,0.00)) AS tradeAmount,
			IFNULL(ope.trade_amount,0.00) AS waterCost,
			@@ -395,7 +397,7 @@
			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)
			AND ope.operate_type IN(1,2,3,5,10)
			AND ope.operate_valid = 2
			<if test = "villageId != null and villageId > 0">
			AND cli.villageId = #{villageId}