pipIrr-SV.git - Gitblit

			@@ -30,6 +30,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"/>
			@@ -65,6 +66,7 @@
			cl_this_amount,
			cl_this_money,
			cl_this_time,
			cl_price,
			cl_open_dt,
			close_dt,
			cl_order_no,
			@@ -102,7 +104,7 @@
			op_order_no, 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_this_amount, 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}, #{lastHistoryId,jdbcType=BIGINT},
			@@ -114,8 +116,9 @@
			#{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})
			#{clPrice,jdbcType=DOUBLE},#{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.RmOpenCloseValveLast">
			<!--@mbg.generated-->
			@@ -198,6 +201,9 @@
			</if>
			<if test="clThisTime != null">
			cl_this_time,
			</if>
			<if test="clPrice != null">
			cl_price,
			</if>
			<if test="clOpenDt != null">
			cl_open_dt,
			@@ -296,6 +302,9 @@
			</if>
			<if test="clThisTime != null">
			#{clThisTime,jdbcType=INTEGER},
			</if>
			<if test="clPrice != null">
			#{clPrice,jdbcType=DOUBLE},
			</if>
			<if test="clOpenDt != null">
			#{clOpenDt,jdbcType=TIMESTAMP},
			@@ -396,6 +405,9 @@
			<if test="clThisTime != null">
			cl_this_time = #{clThisTime,jdbcType=INTEGER},
			</if>
			<if test="clPrice != null">
			cl_price = #{clPrice,jdbcType=DOUBLE},
			</if>
			<if test="clOpenDt != null">
			cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
			</if>
			@@ -445,6 +457,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},
			@@ -466,14 +479,17 @@
			<if test="intakeNum != null and intakeNum != ''">
			AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
			</if>
			<if test="clientName != null and clientName != ''">
			AND oh.client_name LIKE CONCAT('%', #{clientName}, '%')
			</if>
			<if test="rtuAddr != null and rtuAddr != ''">
			AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
			</if>
			<if test="timeStart_open != null and timeStart_open != '' and timeStop_open != null and timeStop_open != ''">
			AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
			AND oh.open_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
			</if>
			<if test="timeStart_close != null and timeStart_close != '' and timeStop_close != null and timeStop_close != ''">
			AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
			AND oh.close_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
			</if>
			</where>
			</select>
			@@ -481,133 +497,50 @@
			<!--根据指定条件获取开关阀报最新记录-->
			<select id="getOpenCloseValveReports_last" 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.op_dt AS openTime,
			CASE
			WHEN oh.op_type = 1 THEN '刷卡开阀'
			WHEN oh.op_type = 3 THEN '中心站开阀'
			WHEN oh.op_type = 5 THEN '余额不足关阀'
			WHEN oh.op_type = 8 THEN '用户远程开阀'
			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.cl_dt AS closeTime,
			CASE
			WHEN oh.cl_type = 2 THEN '刷卡关阀'
			WHEN oh.cl_type = 4 THEN '中心站关阀'
			WHEN oh.cl_type = 5 THEN '余额不足关阀'
			WHEN oh.cl_type = 6 THEN '流量计故障关阀'
			WHEN oh.cl_type = 7 THEN '紧急关闭'
			WHEN oh.cl_type = 9 THEN '用户远程关阀'
			WHEN oh.cl_type = 10 THEN '开关阀卡关阀'
			WHEN oh.cl_type = 12 THEN '黑名单命令关阀'
			WHEN oh.cl_type = 13 THEN '用户远程定时关阀'
			WHEN oh.cl_type = 14 THEN '用户远程定量关阀'
			ELSE '未知'
			END AS closeType,
			oh.cl_this_amount AS closeThisAmount,
			oh.cl_this_time AS thisTime,
			oh.cl_this_money AS thisMoney,
			oh.cl_remain_money AS closeRemainMoney,
			oh.cl_total_amount AS closeTotalAmount
			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_last 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}
			</if>
			<if test="intakeNum != null and intakeNum != ''">
			AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
			</if>
			<if test="clientName != null and clientName != ''">
			AND oh.client_name LIKE CONCAT('%', #{clientName}, '%')
			</if>
			<if test="rtuAddr != null and rtuAddr != ''">
			AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
			</if>
			<if test="timeStart_open != null and timeStart_open != '' and timeStop_open != null and timeStop_open != ''">
			AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
			AND oh.open_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
			</if>
			<if test="timeStart_close != null and timeStart_close != '' and timeStop_close != null and timeStop_close != ''">
			AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
			</if>
			</where>
			ORDER BY oh.op_dt DESC
			<trim prefix="limit ">
			<if test="start != null and count != null">
			#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
			</if>
			</trim>
			</select>
			<!--根据指定条件获取开关阀报最新记录-->
			<select id="getOpenCloseValveReports_last" 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.op_dt AS openTime,

			CASE
			WHEN oh.op_type = 1 THEN '刷卡开阀'
			WHEN oh.op_type = 3 THEN '中心站开阀'
			WHEN oh.op_type = 5 THEN '余额不足关阀'
			WHEN oh.op_type = 8 THEN '用户远程开阀'
			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.cl_dt AS closeTime,
			CASE
			WHEN oh.cl_type = 2 THEN '刷卡关阀'
			WHEN oh.cl_type = 4 THEN '中心站关阀'
			WHEN oh.cl_type = 5 THEN '余额不足关阀'
			WHEN oh.cl_type = 6 THEN '流量计故障关阀'
			WHEN oh.cl_type = 7 THEN '紧急关阀'
			WHEN oh.cl_type = 9 THEN '用户远程关阀'
			WHEN oh.cl_type = 10 THEN '开关阀卡关阀'
			WHEN oh.cl_type = 12 THEN '黑名单命令关阀'
			WHEN oh.cl_type = 13 THEN '远程定时关阀'
			WHEN oh.cl_type = 14 THEN '远程定量关阀'
			ELSE '未知'
			END AS closeType,
			oh.cl_this_amount AS closeThisAmount,
			oh.cl_this_time AS thisTime,
			oh.cl_this_money AS thisMoney,
			oh.cl_remain_money AS closeRemainMoney,
			oh.cl_total_amount AS closeTotalAmount
			FROM rm_open_close_valve_last oh
			INNER JOIN pr_intake inta ON inta.id = oh.intake_id
			<where>
			<if test="intakeId != null and intakeId > 0">
			AND oh.intake_id = #{intakeId}
			</if>
			<if test="intakeNum != null and intakeNum != ''">
			AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
			</if>
			<if test="rtuAddr != null and rtuAddr != ''">
			AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
			</if>
			<if test="timeStart_open != null and timeStop_open != null">
			AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
			</if>
			<if test="timeStart_close != null and timeStop_close != null">
			AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
			AND oh.close_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
			</if>
			</where>
			ORDER BY oh.op_dt DESC
			@@ -619,28 +552,49 @@
			</select>

			<!--根据开阀方式获取操作次数-->
			<select id="getCountByOpenType" resultType="java.lang.Integer">
			SELECT COUNT(*) AS recordCount
			<select id="getCountByOpenType" resultType="com.dy.pipIrrGlobal.voSt.VoCountOfOpenType">
			SELECT
			COUNT(*) AS openTypeCount,
			op_type AS openType
			FROM rm_open_close_valve_history
			<where>
			<if test="idStart != nul">
			id <![CDATA[>=]]> #{idStart}
			</if>
			<if test="idEnd != nul">
			AND id <![CDATA[<=]]> #{idEnd}
			</if>
			<if test="openType != null">
			AND op_type = #{openType}
			</if>
			<if test="timeStart != null and timeStop != null">
			AND op_dt BETWEEN #{timeStart} AND #{timeStop}
			</if>
			</where>
			group by op_type
			</select>

			<!--根据关阀方式获取操作次数-->
			<select id="getCountByCloseType" resultType="java.lang.Integer">
			SELECT COUNT(*) AS recordCount
			<select id="getCountByCloseType" resultType="com.dy.pipIrrGlobal.voSt.VoCountOfCloseType">
			SELECT
			COUNT(*) AS closeTypeCount,
			cl_type AS closeType
			FROM rm_open_close_valve_history
			<where>
			AND cl_type = #{closeType}
			<if test="timeStart != null and timeStop != null">
			AND cl_dt BETWEEN #{timeStart} AND #{timeStop}
			<if test="idStart != nul">
			id <![CDATA[>=]]> #{idStart}
			</if>
			<if test="idEnd != nul">
			AND id <![CDATA[<=]]> #{idEnd}
			</if>
			<if test="closeType != null">
			AND cl_type = #{closeType}
			</if>
			</where>
			group by cl_type
			</select>

			<!--为指定（阀控器地址、水卡编号、无关阀记录）开关阀最新记录添加关阀时间，使之不在未关阀记录中显示-->
			<update id="addCloseTime">
			UPDATE rm_open_close_valve_last
			SET cl_dt = NOW()
			WHERE rtu_addr = #{rtuAddr} AND op_ic_card_no = #{icCardNo} AND cl_dt IS NULL
			</update>
			</mapper>