pipIrr-SV.git - Gitblit

			@@ -431,7 +431,7 @@
			<!--根据指定条件获取开卡记录-->
			<select id="getActiveCards" resultType="com.dy.pipIrrGlobal.voSe.VoActiveCard">
			SELECT
			CAST(ope.id AS char) AS id ,
			ope.id,
			cli.name AS clientName,
			cli.clientNum AS clientNum,
			card.cardNum AS cardNum,
			@@ -442,12 +442,13 @@
			WHEN card.state = 3 THEN '已挂失'
			END) AS stateName,
			ope.card_cost AS cardCost,
			ope.payment_id AS paymentId,
			pay.name AS paymentName,
			(SELECT `name` FROM ba_user WHERE id = ope.operator) AS operator,
			ope.operate_dt AS operateDt
			FROM se_card_operate ope
			INNER JOIN se_client_card card ON ope.card_id = card.id
			INNER JOIN se_client cli ON ope.client_id = cli.id
			INNER JOIN se_payment_method pay ON pay.id = ope.payment_id
			<where>
			AND ope.operate_type = 1
			<if test = "clientName != null and clientName !=''">
			@@ -624,6 +625,14 @@
			AND cli.name like CONCAT('%',#{clientName},'%')
			</if>

			<if test = "onlyGift != null and onlyGift ==true">
			AND ope.gift > 0
			</if>

			<if test = "cashierId != null and cashierId > 0">
			AND ope.operator = #{cashierId}
			</if>

			<if test = "timeStart != null and timeStop != null">
			AND ope.operate_dt BETWEEN #{timeStart} AND #{timeStop}
			</if>
			@@ -633,18 +642,19 @@
			<!--根据指定条件获取收据列表-->
			<select id="getReceipts" resultType="com.dy.pipIrrGlobal.voSe.VoReceipt">
			SELECT
			CAST(ope.id AS char) AS orderNumber,
			ope.id AS orderNumber,
			tow.name AS townName,
			vil.name AS villageName,
			cli.`name`,
			cli.phone,
			CAST(cli.clientNum AS char) AS clientNum,
			CAST(card.cardNum AS char) AS cardNum,
			cli.clientNum,
			card.cardNum,
			(CASE
			WHEN ope.operate_type = 1 THEN '开卡'
			WHEN ope.operate_type = 2 THEN '充值'
			END) AS operateType,
			IFNULL(ope.trade_amount,0) AS waterCost,
			IFNULL(ope.gift,0) AS gift,
			IFNULL(ope.card_cost,0) AS cardCost,
			(IFNULL(ope.trade_amount,0) + IFNULL(ope.card_cost,0)) AS amount,
			card.money,
			@@ -669,6 +679,14 @@
			AND cli.name like CONCAT('%',#{clientName},'%')
			</if>

			<if test = "onlyGift != null and onlyGift ==true">
			AND ope.gift > 0
			</if>

			<if test = "cashierId != null and cashierId > 0">
			AND ope.operator = #{cashierId}
			</if>

			<if test = "timeStart != null and timeStop != null">
			AND ope.operate_dt BETWEEN #{timeStart} AND #{timeStop}
			</if>