用户查询记录表新增字段

wisenergy-mapper/src/main/resources/mapper/UserLimitRecordMapper.xml

@@ -5,6 +5,7 @@
     <resultMap id="userMap" type="cn.wisenergy.model.app.UserLimitRecord">
         <id column="id" property="id"/>
         <result column="user_id" property="userId"/>
+        <result column="user_limit_id" property="userLimitId"/>
         <result column="minus_limit" property="minusLimit"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
@@ -20,15 +21,16 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_id,minus_limit, create_time,update_time
+        user_id,user_limit_id,minus_limit, create_time,update_time
     </sql>
 
     <sql id="vals">
-        #{userId},#{minusLimit},now(),now()
+        #{userId},#{userLimitId},#{minusLimit},now(),now()
     </sql>
 
     <sql id="updateCondition">
         <if test="userId != null">user_id = #{userId},</if>
+        <if test="userLimitId != null">user_limit_id =#{userLimitId},</if>
         <if test="minusLimit != null">minus_limit =#{minusLimit},</if>
         update_time =now()
     </sql>
@@ -36,6 +38,7 @@
     <sql id="criteria">
         <if test="id != null">id = #{id}</if>
         <if test="userId != null">and user_id = #{userId}</if>
+        <if test="userLimitId != null">and user_limit_id =#{userLimitId}</if>
         <if test="minusLimit != null">and minus_limit =#{minusLimit}</if>
         <if test="createTime != null">and create_time &gt;= #{createTime}</if>
         <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
@@ -62,8 +65,10 @@
     </update>
 
     <select id="getByUserId" resultMap="userMap">
-        select <include refid="cols_all"/>
-        from <include refid="table"/>
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
         <where>
             user_id=#{userId}
         </where>

wisenergy-model/src/main/java/cn/wisenergy/model/app/UserLimitRecord.java

@@ -23,30 +23,36 @@ public class UserLimitRecord implements Serializable {
     /**
      * 用户扣减查询次数记录id
      */
-    @ApiModelProperty(value = "用户扣减查询次数记录id",name="id")
+    @ApiModelProperty(value = "用户扣减查询次数记录id", name = "id")
     private Integer id;
 
     /**
      * 用户id
      */
-    @ApiModelProperty(value = "用户扣减查询次数记录id",name="id")
+    @ApiModelProperty(value = "用户扣减查询次数记录id", name = "id")
     private Integer userId;
 
+    /**
+     * 用户查询信息id
+     */
+    @ApiModelProperty(value = "用户查询信息id", name = "userLimitId")
+    private Integer userLimitId;
+
     /**
      * 扣减次数
      */
-    @ApiModelProperty(value = "扣减次数",name="minusLimit")
+    @ApiModelProperty(value = "扣减次数", name = "minusLimit")
     private Integer minusLimit;
 
     /**
      * 扣减时间
      */
-    @ApiModelProperty(value = "扣减时间",name="createTime")
+    @ApiModelProperty(value = "扣减时间", name = "createTime")
     private Date createTime;
 
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间",name="updateTime")
+    @ApiModelProperty(value = "更新时间", name = "updateTime")
     private Date updateTime;
 }

wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java

@@ -73,6 +73,7 @@ public class VolunteerManager {
         //2、保存扣减记录
         UserLimitRecord userLimitRecord = new UserLimitRecord();
         userLimitRecord.setMinusLimit(1);
+        userLimitRecord.setUserLimitId(userLimit.getId());
         userLimitRecord.setUserId(userLimit.getUserId());
         int record = userLimitRecordMapper.add(userLimitRecord);
 
@@ -186,6 +187,7 @@ public class VolunteerManager {
 
     /**
      * 保存个人信息
+     *
      * @param user      用户信息
      * @param scoreInfo 成绩信息
      * @return true or false
@@ -209,6 +211,7 @@ public class VolunteerManager {
 
     /**
      * 编辑个人信息
+     *
      * @param user      用户信息
      * @param scoreInfo 成绩信息
      * @return true or false