pipIrr-SV.git - Gitblit

			@@ -216,16 +216,17 @@
			END AS planned,
			com.send_time AS sendTime,

			<!--同卡、同设备的最后一次工作报的时间和瞬时流量，工作报时间必须晚于同卡、同设备最后一次开阀记录的开阀时间-->
			(SELECT dt FROM rm_work_report_last
			WHERE rtu_addr = com.rtu_addr AND ic_card_no = com.param ->> '$.icCardNo'
			AND dt > (SELECT op_dt FROM rm_open_close_valve_last WHERE rtu_addr = com.rtu_addr AND op_ic_card_no = com.param ->> '$.icCardNo' ORDER BY op_dt DESC LIMIT 1)
			<!--AND dt > (SELECT op_dt FROM rm_open_close_valve_last WHERE rtu_addr = com.rtu_addr AND op_ic_card_no = com.param ->> '$.icCardNo' ORDER BY op_dt DESC LIMIT 1)-->
			AND dt > com.send_time
			ORDER BY dt DESC
			LIMIT 1) AS dt,

			(SELECT water_instant FROM rm_work_report_last
			WHERE rtu_addr = com.rtu_addr AND ic_card_no = com.param ->> '$.icCardNo'
			AND dt > (SELECT op_dt FROM rm_open_close_valve_last WHERE rtu_addr = com.rtu_addr AND op_ic_card_no = com.param ->> '$.icCardNo' ORDER BY op_dt DESC LIMIT 1)
			<!--AND dt > (SELECT op_dt FROM rm_open_close_valve_last WHERE rtu_addr = com.rtu_addr AND op_ic_card_no = com.param ->> '$.icCardNo' ORDER BY op_dt DESC LIMIT 1)-->
			AND dt > com.send_time
			ORDER BY dt DESC
			LIMIT 1) AS waterInstant

			@@ -352,4 +353,12 @@
			</if>
			</trim>
			</select>

			<!--根据命令日志ID获取预约时间，向虚拟卡写开阀时间用-->
			<select id="getTimeByCommId" resultType="java.lang.String">
			SELECT
			CONCAT(param ->> '$.year', '-', param ->> '$.month', '-', param ->> '$.day', ' ', param ->> '$.hour', ':', param ->> '$.minute', ':00') AS openTime
			FROM rm_command_history
			WHERE com_id = #{commId}
			</select>
			</mapper>