Merge branch 'xiaohucoding'
# Conflicts: # pom.xml
This commit is contained in:
@ -25,15 +25,19 @@
|
||||
<if test="args != null">
|
||||
args=#{args},
|
||||
</if>
|
||||
<if test="create_time != null">
|
||||
create_time=#{createTime},
|
||||
</if>
|
||||
<if test="update_time != null">
|
||||
<if test="updateTime != null">
|
||||
update_time=#{updateTime}
|
||||
</if>
|
||||
</set>
|
||||
where dataset_id = #{datasetId}
|
||||
</update>
|
||||
<delete id="deleteBatch">
|
||||
DELETE FROM dataset
|
||||
WHERE dataset_id IN
|
||||
<foreach collection="datasetIds" item="id" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
<select id="pageQuery" resultType="com.bipt.intelligentapplicationorchestrationservice.pojo.DatasetVO">
|
||||
SELECT * FROM dataset
|
||||
<where>
|
||||
@ -49,8 +53,8 @@
|
||||
<if test="dsPath != null">
|
||||
and ds_path=#{dsPath}
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
and create_time=#{createTime}
|
||||
<if test="args != null">
|
||||
and args=#{args}
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
and create_time=#{createTime}
|
||||
|
Reference in New Issue
Block a user