合并

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

@@ -75,10 +75,25 @@ public class TpMessage {
     
     private String messageIconTitle;
 
+    /**
+     * 举报ID
+     * @return
+     */
+     private  Integer transactionId;
+
+    public Integer getTransactionId() {
+        return transactionId;
+    }
+
+    public void setTransactionId(Integer transactionId) {
+        this.transactionId = transactionId;
+    }
+
     public Integer getId() {
         return id;
     }
 
+
     public void setId(Integer id) {
         this.id = id;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -546,20 +546,20 @@ public class SocialServiceImpl implements SocialServiceI {
 
             // 插入消息表
             TpMessage message = new TpMessage();
-            message.setCommunityId(userId);
+            message.setCommunityId(communityId);
             message.setMessageType("9");
             message.setAdviceType("4");
             message.setModelType("1");
             //超级管理员
-            message.setUuid(toCommunitiesMapper.selectAndmin(communityId));
+            Integer userID= toCommunitiesMapper.selectAndmin(communityId);
+            message.setUuid(userID);
             message.setModelType("1");
-            message.setUuid(userId);
             message.setUuidType("2");
             message.setSource("1");
             message.setMessageContent("{" + taUser.getUserName() + "}举报了{" + createUser.getUserName() + "}发布的帖子：{" + tpTransaction.getTransactionTitle() +  "}，举报原因：{" + sysReportReason.getReason() + "}，点击责令发布人修改或直接作废帖子");
             message.setStatus("1");
             message.setReadStatus("0");
-            message.setAnnouncementId(transactionId);
+            message.setTransactionId(transactionId);
             message.setCreateDate(new Date());
             message.setCreateUser(userId);
             tpMessageMapper.insertSelective(message);

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

@@ -124,7 +124,10 @@
         activity_id,
       </if>
       <if test="announcementId != null" >
-        announcement_id,
+      announcement_id,
+    </if>
+      <if test="transactionId != null" >
+        transaction_id
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -183,13 +186,16 @@
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
       <if test="billId != null" >
-        bill_id,
+        #{billId,jdbcType=TIMESTAMP},
       </if>
       <if test="activityId != null" >
-        activity_id,
+        #{activityId,jdbcType=TIMESTAMP},
       </if>
       <if test="announcementId != null" >
-        announcement_id,
+        #{announcementId,jdbcType=TIMESTAMP},
+      </if>
+      <if test="transactionId != null" >
+        #{transactionId,jdbcType=TIMESTAMP},
       </if>
     </trim>
   </insert>