fix(reward):完善了悬赏功能,新增reward_id表
Change-Id: I1d9b93af1cd19e1d0c8ee69ba86f6c1460c883b0
diff --git a/ruoyi-admin/src/main/resources/mapper/system/RewardTasksMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/RewardTasksMapper.xml
index bae8185..4019473 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/RewardTasksMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/RewardTasksMapper.xml
@@ -1,45 +1,47 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.reward.mapper.RewardTasksMapper">
-
+
<resultMap type="RewardTasks" id="RewardTasksResult">
- <result property="rewardId" column="reward_id" />
- <result property="title" column="title" />
- <result property="description" column="description" />
- <result property="amount" column="amount" />
- <result property="status" column="status" />
- <result property="publisherId" column="publisher_id" />
- <result property="accepterId" column="accepter_id" />
- <result property="createTime" column="create_time" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
+ <result property="rewardId" column="reward_id" />
+ <result property="title" column="title" />
+ <result property="description" column="description" />
+ <result property="amount" column="amount" />
+ <result property="status" column="status" />
+ <result property="publisherId" column="publisher_id" />
+ <result property="accepterId" column="accepter_id" />
+ <result property="createTime" column="create_time" />
+ <result property="updateTime" column="update_time" />
+ <result property="remark" column="remark" />
</resultMap>
<sql id="selectRewardTasksVo">
- select reward_id, title, description, amount, status, publisher_id, accepter_id, create_time, update_time, remark from reward_tasks
+ SELECT reward_id, title, description, amount, status, publisher_id, accepter_id, create_time, update_time, remark
+ FROM reward_tasks
+ ORDER BY create_time DESC
</sql>
<select id="selectRewardTasksList" parameterType="RewardTasks" resultMap="RewardTasksResult">
<include refid="selectRewardTasksVo"/>
- <where>
- <if test="title != null and title != ''"> and title = #{title}</if>
- <if test="description != null and description != ''"> and description = #{description}</if>
- <if test="amount != null "> and amount = #{amount}</if>
- <if test="status != null and status != ''"> and status = #{status}</if>
- <if test="publisherId != null "> and publisher_id = #{publisherId}</if>
- <if test="accepterId != null "> and accepter_id = #{accepterId}</if>
+ <where>
+ <if test="title != null and title != ''"> AND title = #{title}</if>
+ <if test="description != null and description != ''"> AND description = #{description}</if>
+ <if test="amount != null"> AND amount = #{amount}</if>
+ <if test="status != null and status != ''"> AND status = #{status}</if>
+ <if test="publisherId != null"> AND publisher_id = #{publisherId}</if>
+ <if test="accepterId != null"> AND accepter_id = #{accepterId}</if>
</where>
</select>
-
+
<select id="selectRewardTasksByRewardId" parameterType="Long" resultMap="RewardTasksResult">
<include refid="selectRewardTasksVo"/>
- where reward_id = #{rewardId}
+ WHERE reward_id = #{rewardId}
</select>
<insert id="insertRewardTasks" parameterType="RewardTasks" useGeneratedKeys="true" keyProperty="rewardId">
- insert into reward_tasks
+ INSERT INTO reward_tasks
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="title != null and title != ''">title,</if>
<if test="description != null and description != ''">description,</if>
@@ -50,8 +52,8 @@
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
+ </trim>
+ <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="title != null and title != ''">#{title},</if>
<if test="description != null and description != ''">#{description},</if>
<if test="amount != null">#{amount},</if>
@@ -61,11 +63,11 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
- </trim>
+ </trim>
</insert>
<update id="updateRewardTasks" parameterType="RewardTasks">
- update reward_tasks
+ UPDATE reward_tasks
<trim prefix="SET" suffixOverrides=",">
<if test="title != null and title != ''">title = #{title},</if>
<if test="description != null and description != ''">description = #{description},</if>
@@ -77,17 +79,26 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
- where reward_id = #{rewardId}
+ WHERE reward_id = #{rewardId}
</update>
<delete id="deleteRewardTasksByRewardId" parameterType="Long">
- delete from reward_tasks where reward_id = #{rewardId}
+ DELETE FROM reward_tasks WHERE reward_id = #{rewardId}
</delete>
- <delete id="deleteRewardTasksByRewardIds" parameterType="String">
- delete from reward_tasks where reward_id in
+ <delete id="deleteRewardTasksByRewardIds" parameterType="Long">
+ DELETE FROM reward_tasks WHERE reward_id IN
<foreach item="rewardId" collection="array" open="(" separator="," close=")">
#{rewardId}
</foreach>
</delete>
+
+ <select id="selectRewardBtByRewardId" parameterType="Integer" resultType="Integer">
+ SELECT reward_bt FROM reward_bt WHERE reward_id = #{rewardId}
+ </select>
+
+ <insert id="insertRewardBt" parameterType="map">
+ INSERT INTO reward_bt (reward_id, reward_bt)
+ VALUES (#{rewardId}, #{rewardBt})
+ </insert>
</mapper>
\ No newline at end of file