pipIrr-SV.git - Gitblit

			@@ -9,6 +9,8 @@
			<result column="intake_id" jdbcType="BIGINT" property="intakeId" />
			<result column="dt" jdbcType="DATE" property="dt" />
			<result column="amount" jdbcType="DOUBLE" property="amount" />
			<result column="money" jdbcType="DOUBLE" property="money" />
			<result column="times" jdbcType="INTEGER" property="times" />
			<result column="dt_last" jdbcType="TIMESTAMP" property="dtLast" />
			<result column="rtu_addr_last" jdbcType="VARCHAR" property="rtuAddrLast" />
			<result column="controller_id_last" jdbcType="BIGINT" property="controllerIdLast" />
			@@ -17,7 +19,7 @@
			</resultMap>
			<sql id="Base_Column_List">
			<!--@mbg.generated-->
			id, last_history_id, intake_id, dt, amount, dt_last, rtu_addr_last, controller_id_last, total_amount_last,
			id, last_history_id, intake_id, dt, amount, money, times, dt_last, rtu_addr_last, controller_id_last, total_amount_last,
			rtu_dt_last
			</sql>
			<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
			@@ -43,11 +45,12 @@
			<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDayLast">
			<!--@mbg.generated-->
			insert into rm_intake_amount_day_last (id, last_history_id, intake_id, dt,
			amount, dt_last,
			amount, money, times, dt_last,
			rtu_addr_last, controller_id_last, total_amount_last,
			rtu_dt_last)
			values (#{id,jdbcType=BIGINT}, #{lastHistoryId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT}, #{dt,jdbcType=DATE},
			#{amount,jdbcType=DOUBLE}, #{dtLast,jdbcType=TIMESTAMP},
			#{amount,jdbcType=DOUBLE}, #{money,jdbcType=DOUBLE},#{times,jdbcType=INTEGER},
			#{dtLast,jdbcType=TIMESTAMP},
			#{rtuAddrLast,jdbcType=VARCHAR}, #{controllerIdLast,jdbcType=BIGINT}, #{totalAmountLast,jdbcType=FLOAT},
			#{rtuDtLast,jdbcType=TIMESTAMP})
			</insert>
			@@ -69,6 +72,12 @@
			</if>
			<if test="amount != null">
			amount,
			</if>
			<if test="money != null">
			money,
			</if>
			<if test="times != null">
			times,
			</if>
			<if test="dtLast != null">
			dt_last,
			@@ -101,6 +110,12 @@
			</if>
			<if test="amount != null">
			#{amount,jdbcType=DOUBLE},
			</if>
			<if test="money != null">
			#{money,jdbcType=DOUBLE},
			</if>
			<if test="times != null">
			#{times,jdbcType=INTEGER},
			</if>
			<if test="dtLast != null">
			#{dtLast,jdbcType=TIMESTAMP},
			@@ -135,6 +150,12 @@
			<if test="amount != null">
			amount = #{amount,jdbcType=DOUBLE},
			</if>
			<if test="money != null">
			money = #{money,jdbcType=DOUBLE},
			</if>
			<if test="times != null">
			times = #{times,jdbcType=INTEGER},
			</if>
			<if test="dtLast != null">
			dt_last = #{dtLast,jdbcType=TIMESTAMP},
			</if>
			@@ -160,6 +181,8 @@
			intake_id = #{intakeId,jdbcType=BIGINT},
			dt = #{dt,jdbcType=DATE},
			amount = #{amount,jdbcType=DOUBLE},
			money = #{money,jdbcType=DOUBLE},
			times = #{times,jdbcType=INTEGER},
			dt_last = #{dtLast,jdbcType=TIMESTAMP},
			rtu_addr_last = #{rtuAddrLast,jdbcType=VARCHAR},
			controller_id_last = #{controllerIdLast,jdbcType=BIGINT},
			@@ -173,7 +196,10 @@
			from rm_intake_amount_day_last riadl
			Left join pr_intake pint on pint.id = riadl.intake_id
			<where>
			<if test="intakeName != null">
			<if test="intakeId != null and intakeId != '' ">
			riadl.intake_id = #{intakeId}
			</if>
			<if test="intakeName != null and intakeName != '' ">
			and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
			</if>
			<if test="startDt != null">
			@@ -191,6 +217,8 @@
			pint.name as intakeName,
			riadl.dt as dt,
			riadl.amount as amount,
			riadl.money as money,
			riadl.times as times,
			riadl.dt_last as dtLast,
			riadl.rtu_addr_last as rtuAddrLast,
			CAST(riadl.controller_id_last AS char)AS controllerIdLast,
			@@ -199,7 +227,10 @@
			from rm_intake_amount_day_last riadl
			Left join pr_intake pint on pint.id = riadl.intake_id
			<where>
			<if test="intakeName != null">
			<if test="intakeId != null and intakeId != '' ">
			riadl.intake_id = #{intakeId}
			</if>
			<if test="intakeName != null and intakeName != '' ">
			and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
			</if>
			<if test="startDt != null">