合并

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

@@ -565,13 +565,14 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransactionReply.setCommunityId(userElement.getCommunityId());
         tpTransactionReply.setTaUserId(userElement.getId());
         tpTransactionReply.setTaUserName(userElement.getUserName());
-        //获取被回复的姓名
-        if ("".equals(tpTransactionReply.getReplyTaUserId())) {
-            tpTransactionReply.setReplyTaUserId(null);
-        }
-        if (null != tpTransactionReply.getReplyTaUserId() & !"".equals(tpTransactionReply.getReplyTaUserId())) {
-            tpTransactionReply.setReplyTaUserName(taUserMapper.selectByPrimaryKey(tpTransactionReply.getReplyTaUserId()).getUserName());
-        }
+
+            // 由于评论帖子和评论对话是同一个接口，当tpTransactionReply.getReplyTaUserId()为空时查询Ta_user里面的名字
+        TpTransaction tpTransaction= tpTransactionMapper.getById(tpTransactionReply.getTransactionId());
+        TaUser taUser= taUserMapper.selectByPrimaryKey(tpTransaction.getTaUserId());
+
+        tpTransactionReply.setReplyTaUserName(tpTransactionReply.getReplyTaUserId()==null?taUser.getUserName():taUserMapper.selectByPrimaryKey(tpTransactionReply.getReplyTaUserId()).getUserName());
+        //  评论帖子取 TpTransaction 的创建人，回复对话取传过来的值
+        tpTransactionReply.setReplyTaUserId(tpTransactionReply.getReplyTaUserId()==null?tpTransaction.getCreateUser():tpTransactionReply.getReplyTaUserId());
         tpTransactionReply.setReleaseIdentity("0");
         tpTransactionReply.setTaUserVerifyId(userElement.getUserVerifyId());
         tpTransactionReply.setCreateDate(new Date());

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

@@ -44,10 +44,10 @@
 	sr.role_name AS role_name,
 	ttr.release_identity,
 	ttr.ta_user_verify_id
-FROM
-	tp_transaction ttr
-LEFT JOIN ta_sys_user_role tsur ON ttr.ta_user_id = tsur.user_id
-LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
+    FROM
+        tp_transaction ttr
+    LEFT JOIN ta_sys_user_role tsur ON ttr.ta_user_id = tsur.user_id
+    LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     where ttr.id = #{id,jdbcType=INTEGER} and ttr.community_id=#{communityId,jdbcType=INTEGER}
   </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
  */
 public interface TpTransactionMapper extends BaseMapper<TpTransaction> {
 
-	List<TpTransaction> selectListByParams(Page page, @Param("transactionTitle") String transactionTitle,@Param("userName") String userName, @Param("id")Integer id, @Param("status")Integer status,@Param("communityId") Integer communityId);
+	List<TpTransaction> selectListByParams(Page page, @Param("transactionTitle") String transactionTitle,@Param("userName") String userName, @Param("id")Integer id, @Param("status")String status,@Param("communityId") Integer communityId);
 
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TransactionReplyMapper.java

@@ -24,5 +24,5 @@ public interface TransactionReplyMapper extends BaseMapper<TransactionReply> {
      * @param id
      * @return
      */
-    List<TransactionReply> transactionReplyList(Page page, @Param("id") Integer id, @Param("userID") Integer userID, @Param("status") Integer status,@Param("taUserName") String taUserName, @Param("createDate") Date createDate, @Param("replyTaUserName") String replyTaUserName);
+    List<TransactionReply> transactionReplyList(Page page, @Param("id") Integer id, @Param("taUserId") Integer taUserId, @Param("status") Integer status,@Param("taUserName") String taUserName, @Param("createDate") Date createDate, @Param("replyTaUserName") String replyTaUserName);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java

@@ -63,7 +63,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		String transactionTitle = object.getString("transactionTitle");
 		String userName = object.getString("userName");
 		Integer id = object.getInteger("id");
-		Integer status = object.getInteger("status");
+		String status = object.getString("status");
 		Integer pageNum = object.getInteger("pageNum");
 		Integer pageSize = object.getInteger("pageSize");
 		Page<TpTicket> page = new Page<>();
@@ -275,8 +275,10 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		Page<TransactionReply> page = new Page<>();
 		page.setSize(pageSize == null ? 10 : pageSize);
 		page.setCurrent(pageNum == null ? 1 : pageNum);
+		// 获得aap的id
+		Integer taUserId= userMapper.selectById(userID).getTaUserId();
 		// 分页查询
-		List<TransactionReply> TransactionReplylList = transactionReplyMapper.transactionReplyList(page,id,userID,status,taUserName,createDate,replyTaUserName);
+		List<TransactionReply> TransactionReplylList = transactionReplyMapper.transactionReplyList(page,id,taUserId,status,taUserName,createDate,replyTaUserName);
 		//查询帖子评论所带图片
 
 		for (TransactionReply transactionReply:TransactionReplylList){

CODE/smart-community/property-api/src/main/resources/application.yml

@@ -14,4 +14,4 @@ mybatis-plus:
 
 # 二维码生成地址
 qr-code:
-  url: https://www.baidu.com/
+  url: https://www.baidu.com/?id=

CODE/smart-community/property-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -28,8 +28,8 @@
         <if test="transactionTitle != null and transactionTitle != ''">
             and t.transaction_title like concat('%',#{transactionTitle,jdbcType=VARCHAR},'%')
         </if>
-        <if test="status != null and status != '' and status != '-1' ">
-            and t.status = #{status}
+        <if test="status != null and status != ''">
+            and t.type = #{status,jdbcType=VARCHAR}
         </if>
         <if test="userName != null and userName != ''">
             and ta.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%')

CODE/smart-community/property-api/src/main/resources/mapper/TransactionReplyMapper.xml

@@ -18,10 +18,8 @@
     WHERE
         tr.id = #{id}
     <if test="status != null and status !=''and status == 0 ">
-    AND re.release_identity in(1,2)
-    AND re.reply_ta_user_id = #{userID}
+    AND re.reply_ta_user_id = #{taUserId}
     </if>
-
     <if test="status != null and status !=''and status == 1 ">
     AND re.release_identity = 0
     AND re.reply_ta_user_id = #{userID}
@@ -33,7 +31,6 @@
     </if>
 
     <if test="status != null and status !=''and status == 3 ">
-    AND re.release_identity in(1,2)
     AND re.ta_user_id = tr.create_user
     </if>
 

VUECODE/smart-property-manage/src/views/social/transaction/reply/transactionreply.vue

@@ -118,6 +118,7 @@ export default {
         pageNum: '1',
         pageSize: 10,
         dataValue: '',
+        tatus: '',
         dialogFormVisible: false,
         formLabelWidth: '120px',
         contentImg: [], 
@@ -290,6 +291,7 @@ export default {
         width: 100%;
         overflow: auto;
         word-break: break-all; 
+        margin-left: -14.5%;
     }
 </style>
 

VUECODE/smart-property-manage/src/views/social/transaction/transactionDetails.vue

@@ -148,6 +148,9 @@ export default {
     },
     // 查看此帖子的所有回复
     replyList(){
+      if(this.ruleForm.replySum == '0'){
+        return
+      }
       this.$router.push({ name: 'transactionreply-index', query: { id: this.ruleForm.id }})
     },
     // 弹出层