pipIrr-SV.git - Gitblit

			@@ -29,6 +29,7 @@
			<result column="cl_this_amount" jdbcType="DOUBLE" property="clThisAmount"/>
			<result column="cl_this_money" jdbcType="DOUBLE" property="clThisMoney"/>
			<result column="cl_this_time" jdbcType="INTEGER" property="clThisTime"/>
			<result column="cl_price" jdbcType="DOUBLE" property="clPrice"/>
			<result column="cl_open_dt" jdbcType="TIMESTAMP" property="clOpenDt"/>
			<result column="close_dt" jdbcType="TIMESTAMP" property="closeDt"/>
			<result column="cl_order_no" jdbcType="VARCHAR" property="clOrderNo"/>
			@@ -63,6 +64,7 @@
			cl_this_amount,
			cl_this_money,
			cl_this_time,
			cl_price,
			cl_open_dt,
			close_dt,
			cl_order_no,
			@@ -93,7 +95,7 @@
			op_ele_total_amount, op_water_remain_user, cl_dt,
			cl_type, cl_total_amount, cl_ic_card_no,
			cl_ic_card_addr, cl_remain_money, cl_this_amount,
			cl_this_money, cl_this_time, cl_open_dt,
			cl_this_money, cl_this_time, cl_price, cl_open_dt,
			close_dt, cl_order_no, cl_ele_total_amount,
			cl_water_remain_user, cl_this_ele)
			values (#{id,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT}, #{clientName,jdbcType=VARCHAR},
			@@ -104,9 +106,9 @@
			#{opEleTotalAmount,jdbcType=FLOAT}, #{opWaterRemainUser,jdbcType=FLOAT}, #{clDt,jdbcType=TIMESTAMP},
			#{clType,jdbcType=TINYINT}, #{clTotalAmount,jdbcType=DOUBLE}, #{clIcCardNo,jdbcType=VARCHAR},
			#{clIcCardAddr,jdbcType=VARCHAR}, #{clRemainMoney,jdbcType=DOUBLE}, #{clThisAmount,jdbcType=DOUBLE},
			#{clThisMoney,jdbcType=DOUBLE}, #{clThisTime,jdbcType=INTEGER}, #{clOpenDt,jdbcType=TIMESTAMP},
			#{closeDt,jdbcType=TIMESTAMP}, #{clOrderNo,jdbcType=VARCHAR}, #{clEleTotalAmount,jdbcType=FLOAT},
			#{clWaterRemainUser,jdbcType=FLOAT}, #{clThisEle,jdbcType=FLOAT})
			#{clThisMoney,jdbcType=DOUBLE}, #{clThisTime,jdbcType=INTEGER}, #{clPrice,jdbcType=INTEGER},
			#{clOpenDt,jdbcType=TIMESTAMP}, #{closeDt,jdbcType=TIMESTAMP}, #{clOrderNo,jdbcType=VARCHAR},
			#{clEleTotalAmount,jdbcType=FLOAT},#{clWaterRemainUser,jdbcType=FLOAT}, #{clThisEle,jdbcType=FLOAT})
			</insert>
			<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
			<!--@mbg.generated-->
			@@ -183,6 +185,9 @@
			</if>
			<if test="clThisMoney != null">
			cl_this_money,
			</if>
			<if test="clPrice != null">
			cl_price,
			</if>
			<if test="clThisTime != null">
			cl_this_time,
			@@ -282,6 +287,9 @@
			<if test="clThisTime != null">
			#{clThisTime,jdbcType=INTEGER},
			</if>
			<if test="clPrice != null">
			#{clPrice,jdbcType=DOUBLE},
			</if>
			<if test="clOpenDt != null">
			#{clOpenDt,jdbcType=TIMESTAMP},
			</if>
			@@ -378,6 +386,9 @@
			<if test="clThisTime != null">
			cl_this_time = #{clThisTime,jdbcType=INTEGER},
			</if>
			<if test="clPrice != null">
			cl_price = #{clPrice,jdbcType=INTEGER},
			</if>
			<if test="clOpenDt != null">
			cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
			</if>
			@@ -426,6 +437,7 @@
			cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
			cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
			cl_this_time = #{clThisTime,jdbcType=INTEGER},
			cl_price = #{clPrice,jdbcType=DOUBLE},
			cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
			close_dt = #{closeDt,jdbcType=TIMESTAMP},
			cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
			@@ -462,16 +474,8 @@
			</where>
			</select>

			<!--根据指定条件获取开关阀报历史记录-->
			<select id="getOpenCloseValveReports_history" resultType="com.dy.pipIrrGlobal.voRm.VoOpenCloseValve">
			SELECT oh.intake_id AS intakeId,
			inta.name AS intakenum,
			oh.rtu_addr AS rtuAddr,
			oh.client_name AS clientName,
			oh.op_ic_card_no AS openIcNum,
			oh.op_ic_card_addr AS openIcAddr,
			oh.open_dt AS openTime,
			CASE
			<!--根据指定条件获取开关阀报历史记录
			CASE
			WHEN oh.op_type = 1 THEN '刷卡开阀'
			WHEN oh.op_type = 3 THEN '中心站开阀'
			WHEN oh.op_type = 5 THEN '余额不足关阀'
			@@ -479,15 +483,8 @@
			WHEN oh.op_type = 11 THEN '巡检卡开阀'
			ELSE '未知'
			END AS openType,
			oh.op_order_no AS openOrderNo,
			oh.op_total_amount AS openTotalAmount,
			oh.op_remain_money AS openRemainMoney,
			oh.op_water_remain_user AS openWaterRemain,
			oh.op_ele_total_amount AS openEleTotalAmount,
			oh.cl_ic_card_no AS closeIcNum,
			oh.cl_ic_card_addr AS closeIcAddr,
			oh.close_dt AS closeTime,
			CASE

			CASE
			WHEN oh.cl_type = 2 THEN '刷卡关阀'
			WHEN oh.cl_type = 4 THEN '中心站关阀'
			WHEN oh.cl_type = 5 THEN '余额不足关阀'
			@@ -500,13 +497,35 @@
			WHEN oh.cl_type = 14 THEN '用户远程定量关阀'
			ELSE '未知'
			END AS closeType,
			-->
			<select id="getOpenCloseValveReports_history" resultType="com.dy.pipIrrGlobal.voRm.VoOpenCloseValve">
			SELECT oh.intake_id AS intakeId,
			inta.name AS intakenum,
			oh.rtu_addr AS rtuAddr,
			cl.name AS clientName,
			cl.address AS clientAddr,
			oh.op_ic_card_no AS openIcNum,
			oh.op_ic_card_addr AS openIcAddr,
			oh.open_dt AS openTime,
			oh.op_type AS opType,
			oh.op_order_no AS openOrderNo,
			oh.op_total_amount AS openTotalAmount,
			oh.op_remain_money AS openRemainMoney,
			oh.op_water_remain_user AS openWaterRemain,
			oh.op_ele_total_amount AS openEleTotalAmount,
			oh.cl_ic_card_no AS closeIcNum,
			oh.cl_ic_card_addr AS closeIcAddr,
			oh.close_dt AS closeTime,
			oh.cl_type AS clType,
			oh.cl_this_amount AS closeThisAmount,
			oh.cl_this_time AS thisTime,
			oh.cl_price AS closePrice,
			oh.cl_this_money AS thisMoney,
			oh.cl_remain_money AS closeRemainMoney,
			oh.cl_total_amount AS closeTotalAmount
			FROM rm_open_close_valve_history oh
			INNER JOIN pr_intake inta ON inta.id = oh.intake_id
			LEFT JOIN pr_intake inta ON inta.id = oh.intake_id
			LEFT JOIN se_client cl ON cl.id = oh.client_id
			<where>
			<if test="intakeId != null and intakeId > 0">
			AND oh.intake_id = #{intakeId}
			@@ -527,7 +546,7 @@
			AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
			</if>
			</where>
			ORDER BY oh.op_dt DESC
			ORDER BY oh.id DESC
			<trim prefix="limit ">
			<if test="start != null and count != null">
			#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}