合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionReplyMapper.java

@@ -1,7 +1,12 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.TpTransactionReply;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
+@Mapper
 public interface TpTransactionReplyMapper {
     int deleteByPrimaryKey(Integer id);
 
@@ -14,4 +19,12 @@ public interface TpTransactionReplyMapper {
     int updateByPrimaryKeySelective(TpTransactionReply record);
 
     int updateByPrimaryKey(TpTransactionReply record);
+
+    /**
+     * 根据 小区id 和 帖子id
+     * @param communityId
+     * @param transactionId
+     * @return
+     */
+    List<TpTransactionReply> getCommunityIdAndTransactionId(@Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId);
 }

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

@@ -44,6 +44,9 @@ public class TpTransaction {
 
     private  String roleName;
 
+    // 帖子的回复集合
+    private List<TpTransactionReply> replies;
+
     public String getRoleName() {
         return roleName;
     }
@@ -184,4 +187,12 @@ public class TpTransaction {
     public void setCreateUserName(String createUserName) {
         this.createUserName = createUserName;
     }
+
+    public List<TpTransactionReply> getReplies() {
+        return replies;
+    }
+
+    public void setReplies(List<TpTransactionReply> replies) {
+        this.replies = replies;
+    }
 }

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

@@ -86,7 +86,7 @@ public class SocialServiceImpl implements SocialServiceI {
     private ToCommunitiesMapper  toCommunitiesMapper;
 
     @Autowired
-    private TpTransactionReportMapper  tpTransactionReportMapper;
+    private TpTransactionReplyMapper tpTransactionReplyMapper;
 
     @Override
     @Transactional
@@ -591,6 +591,7 @@ public class SocialServiceImpl implements SocialServiceI {
         //获取被回复的姓名
         tpTransactionReply.setReplyTaUserName( taUserMapper.selectByPrimaryKey(tpTransactionReply.getReplyTaUserId()).getUserName());
         tpTransactionReply.setCreateDate(new Date());
+        tpTransactionReplyMapper.insert(tpTransactionReply);
         response.addSuccess("成功");
         return response;
     }
@@ -732,7 +733,8 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransaction.setImgList(imgList);
 
         // 查询回复信息
-
+        List<TpTransactionReply> transactionReplies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(communityId, tpTransaction.getId());
+        tpTransaction.setReplies(transactionReplies);
 
         return tpTransaction;
 

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

@@ -139,4 +139,10 @@
       create_date = #{createDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <select id="getCommunityIdAndTransactionId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"/>
+    from tp_transaction_reply
+    where community_id = #{communityId,jdbcType=INTEGER} and transaction_id = #{transactionId,jdbcType=INTEGER}
+  </select>
 </mapper>