修改字段

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpMessage.java

@@ -40,7 +40,13 @@ public class TpMessage {
     private Date updateDate;
 
     /** 缴费项ID **/
-    private Integer commonId;
+    private Integer billId;
+
+    /** 活动Id **/
+    private Integer activityId;
+
+    /** 公告Id **/
+    private Integer announcementId;
     
     /**
      * 工单状态
@@ -261,11 +267,27 @@ public class TpMessage {
         this.messageIconTitle = messageIconTitle;
     }
 
-    public Integer getCommonId() {
-        return commonId;
+    public Integer getBillId() {
+        return billId;
+    }
+
+    public void setBillId(Integer billId) {
+        this.billId = billId;
+    }
+
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
+
+    public Integer getAnnouncementId() {
+        return announcementId;
     }
 
-    public void setCommonId(Integer commonId) {
-        this.commonId = commonId;
+    public void setAnnouncementId(Integer announcementId) {
+        this.announcementId = announcementId;
     }
 }

CODE/smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.community.huiju.dao.TpMessageMapper" >
   <resultMap id="BaseResultMap" type="com.community.huiju.model.TpMessage" >
     <id column="id" property="id" jdbcType="INTEGER" />
-    <id column="ticket_id" property="ticketId" jdbcType="INTEGER" />
+    <result column="ticket_id" property="ticketId" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
     <result column="message_type" property="messageType" jdbcType="CHAR" />
     <result column="advice_type" property="adviceType" jdbcType="CHAR" />
@@ -20,21 +20,17 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
-    <result column="ticket_status" property="ticketStatus" jdbcType="VARCHAR" />
-    <result column="content" property="content" jdbcType="VARCHAR" />
-    <result column="read_message_icon" property="readMessageIcon" jdbcType="VARCHAR" />
-    <result column="unread_message_icon" property="unreadMessageIcon" jdbcType="VARCHAR" />
-    <result column="message_detail_url" property="messageDetailUrl" jdbcType="VARCHAR" />
-    <result column="message_icon_title" property="messageIconTitle" jdbcType="VARCHAR" />
-    <result column="common_id" property="commonId" jdbcType="INTEGER" />
+    <result column="bill_id" property="billId" jdbcType="INTEGER" />
+    <result column="activity_id" property="activityId" jdbcType="INTEGER" />
+    <result column="announcement_id" property="announcementId" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, ticket_id,community_id, message_type, advice_type, model_type, uuid, uuid_type, source,
-    message_content, status, result, meaasge_type_id, read_status, create_user, create_date, 
-    update_user, update_date, common_id
+    id, ticket_id, community_id, message_type, advice_type, model_type, uuid, uuid_type,
+    source, message_content, status, result, meaasge_type_id, read_status, create_user,
+    create_date, update_user, update_date, bill_id, activity_id, announcement_id
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from tp_message
     where id = #{id,jdbcType=INTEGER}
@@ -44,26 +40,28 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpMessage" >
-    insert into tp_message (id, ticket_id, community_id, message_type,
-      advice_type, model_type, uuid, 
-      uuid_type, source, message_content, 
-      status, result, meaasge_type_id, 
-      read_status, create_user, create_date, 
-      update_user, update_date, common_id)
-    values (#{id,jdbcType=INTEGER}, #{ticketId,jdbcType=INTEGER},#{communityId,jdbcType=INTEGER}, #{messageType,jdbcType=CHAR},
-      #{adviceType,jdbcType=CHAR}, #{modelType,jdbcType=CHAR}, #{uuid,jdbcType=INTEGER}, 
-      #{uuidType,jdbcType=CHAR}, #{source,jdbcType=CHAR}, #{messageContent,jdbcType=VARCHAR}, 
-      #{status,jdbcType=CHAR}, #{result,jdbcType=VARCHAR}, #{meaasgeTypeId,jdbcType=VARCHAR}, 
-      #{readStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
-      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, #{commonId,jdbcType=INTEGER})
+    insert into tp_message (id, ticket_id, community_id,
+      message_type, advice_type, model_type,
+      uuid, uuid_type, source, message_content,
+      status, result, meaasge_type_id,
+      read_status, create_user, create_date,
+      update_user, update_date, bill_id,
+      activity_id, announcement_id)
+    values (#{id,jdbcType=INTEGER}, #{ticketId,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER},
+      #{messageType,jdbcType=CHAR}, #{adviceType,jdbcType=CHAR}, #{modelType,jdbcType=CHAR},
+      #{uuid,jdbcType=INTEGER}, #{uuidType,jdbcType=CHAR}, #{source,jdbcType=CHAR}, #{messageContent,jdbcType=VARCHAR},
+      #{status,jdbcType=CHAR}, #{result,jdbcType=VARCHAR}, #{meaasgeTypeId,jdbcType=VARCHAR},
+      #{readStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP},
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, #{billId,jdbcType=INTEGER},
+      #{activityId,jdbcType=INTEGER}, #{announcementId,jdbcType=INTEGER})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TpMessage" useGeneratedKeys="true" keyProperty="id" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpMessage" >
     insert into tp_message
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
         id,
       </if>
-      <if test="ticketId != null">
+      <if test="ticketId != null" >
         ticket_id,
       </if>
       <if test="communityId != null" >
@@ -114,15 +112,21 @@
       <if test="updateDate != null" >
         update_date,
       </if>
-      <if test="commonId != null">
-        common_id,
+      <if test="billId != null" >
+        bill_id,
+      </if>
+      <if test="activityId != null" >
+        activity_id,
+      </if>
+      <if test="announcementId != null" >
+        announcement_id,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
         #{id,jdbcType=INTEGER},
       </if>
-      <if test="ticketId != null">
+      <if test="ticketId != null" >
         #{ticketId,jdbcType=INTEGER},
       </if>
       <if test="communityId != null" >
@@ -173,15 +177,21 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="commonId != null">
-        #{commonId,jdbcType=INTEGER},
+      <if test="billId != null" >
+        #{billId,jdbcType=INTEGER},
+      </if>
+      <if test="activityId != null" >
+        #{activityId,jdbcType=INTEGER},
+      </if>
+      <if test="announcementId != null" >
+        #{announcementId,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpMessage" >
     update tp_message
     <set >
-      <if test="ticketId != null">
+      <if test="ticketId != null" >
         ticket_id = #{ticketId,jdbcType=INTEGER},
       </if>
       <if test="communityId != null" >
@@ -232,8 +242,14 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="commonId != null">
-        common_id = #{commonId,jdbcType=INTEGER}
+      <if test="billId != null" >
+        bill_id = #{billId,jdbcType=INTEGER},
+      </if>
+      <if test="activityId != null" >
+        activity_id = #{activityId,jdbcType=INTEGER},
+      </if>
+      <if test="announcementId != null" >
+        announcement_id = #{announcementId,jdbcType=INTEGER},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -257,7 +273,9 @@
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
       update_date = #{updateDate,jdbcType=TIMESTAMP},
-      common_id = #{commonId,jdbcType=INTEGER}
+      bill_id = #{billId,jdbcType=INTEGER},
+      activity_id = #{activityId,jdbcType=INTEGER},
+      announcement_id = #{announcementId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>