|
@@ -15,15 +15,24 @@
|
|
|
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
|
|
<result column="update_by" jdbcType="INTEGER" property="updateBy" />
|
|
|
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
|
|
|
+ <result column="transfer_type" jdbcType="TINYINT" property="transferType" />
|
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
|
field_code, transfer_addr, transfer_status, err_code, err_info, transfer_start_time,
|
|
|
transfer_finish_time, transfer_progress, create_by, create_time, update_by, update_time
|
|
|
</sql>
|
|
|
|
|
|
- <select id="selectByCondition" parameterType="com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto" resultMap="BaseResultMap">
|
|
|
+ <select id="selectByCondition" parameterType="com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto" resultType="com.energy.manage.service.domain.vo.wavedatatransfer.WaveDataTransferVo">
|
|
|
select
|
|
|
- <include refid="Base_Column_List" />
|
|
|
+ field.field_name,
|
|
|
+ transfer.field_code,
|
|
|
+ transfer.transfer_addr,
|
|
|
+ transfer.transfer_status,
|
|
|
+ transfer.err_code,
|
|
|
+ transfer.err_info,
|
|
|
+ transfer.transfer_start_time,
|
|
|
+ transfer.transfer_finish_time,
|
|
|
+ transfer.transfer_progress
|
|
|
from wave_data_transfer transfer
|
|
|
left join wind_field field
|
|
|
on transfer.field_code = field.field_code
|
|
@@ -34,8 +43,11 @@
|
|
|
<if test="transferStatus != null">
|
|
|
and transfer.transfer_status = #{transferStatus}
|
|
|
</if>
|
|
|
+ <if test="transferType != null">
|
|
|
+ and transfer.transfer_type = #{transferType}
|
|
|
+ </if>
|
|
|
</where>
|
|
|
- order by update_time desc
|
|
|
+ order by transfer.update_time desc
|
|
|
</select>
|
|
|
|
|
|
<select id="selectCountByCondition" parameterType="com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto" resultType="java.lang.Integer">
|
|
@@ -52,7 +64,7 @@
|
|
|
</select>
|
|
|
|
|
|
|
|
|
- <update id="updateByPrimaryKeySelective" parameterType="com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo">
|
|
|
+ <update id="update" parameterType="com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo">
|
|
|
update wave_data_transfer
|
|
|
<set>
|
|
|
<if test="fieldCode != null">
|
|
@@ -61,35 +73,14 @@
|
|
|
<if test="transferAddr != null">
|
|
|
transfer_addr = #{transferAddr,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
- <if test="trasferStatus != null">
|
|
|
- transfer_status = #{trasferStatus,jdbcType=TINYINT},
|
|
|
- </if>
|
|
|
- <if test="errCode != null">
|
|
|
- err_code = #{errCode,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="errInfo != null">
|
|
|
- err_info = #{errInfo,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="transferStartTime != null">
|
|
|
- transfer_start_time = #{transferStartTime,jdbcType=TIMESTAMP},
|
|
|
- </if>
|
|
|
- <if test="transferFinishTime != null">
|
|
|
- transfer_finish_time = #{transferFinishTime,jdbcType=TIMESTAMP},
|
|
|
- </if>
|
|
|
- <if test="transferProgress != null">
|
|
|
- transfer_progress = #{transferProgress,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="createBy != null">
|
|
|
- create_by = #{createBy,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="createTime != null">
|
|
|
- create_time = #{createTime,jdbcType=TIMESTAMP},
|
|
|
+ <if test="transferStatus != null">
|
|
|
+ transfer_status = #{transferStatus,jdbcType=TINYINT},
|
|
|
</if>
|
|
|
<if test="updateBy != null">
|
|
|
update_by = #{updateBy,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
<if test="updateTime != null">
|
|
|
- update_time = #{updateTime,jdbcType=TIMESTAMP},
|
|
|
+ update_time = #{updateTime,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
</set>
|
|
|
where id = #{id,jdbcType=BIGINT}
|