重构 话题模块 包括帖子的回复

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -252,7 +252,7 @@ public class SocialController extends BaseController {
     public ResponseBean findUsedDetails(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
+        Integer userId = userElement.getUserVerifyId();
 
         if (!check(communityId)) {
             responseBean.addError("小区不存在");
@@ -379,7 +379,7 @@ public class SocialController extends BaseController {
     public ResponseBean ubdateTransaction(HttpSession session,@PathVariable("id") String id, @RequestBody String paramets) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
+        Integer userId = userElement.getUserVerifyId();
         ResponseBean response = socialServiceI.updateTransaction(paramets,userId,Integer.valueOf(id));
         return response;
     }

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

@@ -25,10 +25,10 @@ public interface TpTransactionReplyMapper {
      * @param communityId
      * @param transactionId
      * @param userID
-     * @param founderUserID
+     * @param
      * @return
      */
-    List<TpTransactionReply> getCommunityIdAndTransactionId(@Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId,@Param("userID") Integer userID,@Param("founderUserID") Integer founderUserID,@Param("type")Integer type, @Param("roomNoName")String roomNoName);
+    List<TpTransactionReply> getCommunityIdAndTransactionId(@Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId,@Param("userID") Integer userID,@Param("uuid") Integer uuid,@Param("uuidType") String uuidType,@Param("type")Integer type);
 
     /**
      * 查询我回复别人的帖子

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

@@ -8,8 +8,6 @@ public class TpTransaction {
 
     private Integer communityId;
 
-    private Integer taUserId;
-
     private String transactionTitle;
 
     private String transactionContent;
@@ -29,6 +27,21 @@ public class TpTransaction {
     private Integer updateUser;
 
     private Date updateDate;
+    
+    /**
+     * 身份ID 根据uuid_type区分是物业端TP_USER_ID还是TA_USER_VERIFY_ID
+     */
+    private Integer uuid;
+    
+    /**
+     * app/prop
+     */
+    private String uuidType;
+    
+    /**
+     * 话题发布人
+     */
+    private String uuidName;
 
     //返回查询帖子电话
     private String telephone;
@@ -58,11 +71,6 @@ public class TpTransaction {
      */
     private Integer noLikeCount;
 
-    /**
-     * 对应app端的角色表，物业端发帖时不维护
-     */
-    private Integer taUserVerifyId;
-
     /**
      * 0为app端，1为物业
      */
@@ -86,14 +94,6 @@ public class TpTransaction {
      */
     private String bel;
 
-    public Integer getTaUserVerifyId() {
-        return taUserVerifyId;
-    }
-
-    public void setTaUserVerifyId(Integer taUserVerifyId) {
-        this.taUserVerifyId = taUserVerifyId;
-    }
-
     public String getRoleName() {
         return roleName;
     }
@@ -124,14 +124,6 @@ public class TpTransaction {
         this.communityId = communityId;
     }
 
-    public Integer getTaUserId() {
-        return taUserId;
-    }
-
-    public void setTaUserId(Integer taUserId) {
-        this.taUserId = taUserId;
-    }
-
     public String getTransactionTitle() {
         return transactionTitle;
     }
@@ -274,4 +266,28 @@ public class TpTransaction {
     public void setRoomNoName(String roomNoName) {
         this.roomNoName = roomNoName;
     }
+    
+    public Integer getUuid() {
+        return uuid;
+    }
+    
+    public void setUuid(Integer uuid) {
+        this.uuid = uuid;
+    }
+    
+    public String getUuidType() {
+        return uuidType;
+    }
+    
+    public void setUuidType(String uuidType) {
+        this.uuidType = uuidType;
+    }
+    
+    public String getUuidName() {
+        return uuidName;
+    }
+    
+    public void setUuidName(String uuidName) {
+        this.uuidName = uuidName;
+    }
 }

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

@@ -1,28 +1,81 @@
 package com.community.huiju.model;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
 public class TpTransactionReply {
-
+    
     private Integer id;
-
+    /**
+     * 小区id
+     */
     private Integer communityId;
-
+    
+    /**
+     * 交易帖子ID
+     */
     private Integer transactionId;
-
-    private Integer taUserId;
-
-    private String taUserName;
-
+    
+    /**
+     * 回复帖子的ID,根据uuid_type区分物业端app端
+     */
+    private Integer uuid;
+    
+    /**
+     * app/prop
+     */
+    private String uuidType;
+    
+    /**
+     * 回复帖子的姓名
+     */
+    private String uuidName;
+    
+    /**
+     * 回复帖子的角色
+     */
+    private String uuidRole;
+    
+    /**
+     * 回复内容
+     */
     private String replyContent;
-
-    private Integer replyTaUserId;
-
-    private String replyTaUserName;
-
+    
+    /**
+     * 被回复的评论内容的用户ID根据uuidtype区分
+     */
+    private Integer replyUuid;
+    
+    /**
+     * app/prop
+     */
+    private String replyUuidType;
+    
+    /**
+     * 被回复的评论内容的姓名
+     */
+    private String replyUuidName;
+    
+    /**
+     * 被回复的评论人的角色
+     */
+    private String replyUuidRole;
+    
+    /**
+     * 发布者身份
+     */
+    private String releaseIdentity;
+    
+    /**
+     * 创建时间
+     */
     private Date createDate;
-
+    
+    /**
+     * 用户角色
+     */
+    private String roleName;
     /**
      * 住户端 的角色
      */
@@ -32,25 +85,15 @@ public class TpTransactionReply {
      * 被回复人 的角色
      */
     private String replyRoleName;
+    
+    private String createUserName;
 
     /**
      * 回复的图片
      * @return
      */
     private List<String> imgList;
-
-    /**
-     *0代表app端用户，1代表物业端用户
-     * @return
-     */
-    private String releaseIdentity;
-
-    /**
-     * 用于查询app端角色，物业端不维护
-     * @param releaseIdentity
-     */
-    private  Integer taUserVerifyId;
-
+    
     private String roomNoName;
 
     public String getRoomNoName() {
@@ -61,13 +104,7 @@ public class TpTransactionReply {
         this.roomNoName = roomNoName;
     }
 
-    public void setTaUserVerifyId(Integer taUserVerifyId) {
-        this.taUserVerifyId = taUserVerifyId;
-    }
-
-    public Integer getTaUserVerifyId() {
-        return taUserVerifyId;
-    }
+    
 
     public void setReleaseIdentity(String releaseIdentity) {
         this.releaseIdentity = releaseIdentity;
@@ -108,23 +145,15 @@ public class TpTransactionReply {
     public void setTransactionId(Integer transactionId) {
         this.transactionId = transactionId;
     }
-
-    public Integer getTaUserId() {
-        return taUserId;
+    
+    public String getRoleName() {
+        return roleName;
     }
-
-    public void setTaUserId(Integer taUserId) {
-        this.taUserId = taUserId;
+    
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
     }
-
-    public String getTaUserName() {
-        return taUserName;
-    }
-
-    public void setTaUserName(String taUserName) {
-        this.taUserName = taUserName == null ? null : taUserName.trim();
-    }
-
+    
     public String getReplyContent() {
         return replyContent;
     }
@@ -132,23 +161,71 @@ public class TpTransactionReply {
     public void setReplyContent(String replyContent) {
         this.replyContent = replyContent == null ? null : replyContent.trim();
     }
-
-    public Integer getReplyTaUserId() {
-        return replyTaUserId;
+    
+    public Integer getUuid() {
+        return uuid;
     }
-
-    public void setReplyTaUserId(Integer replyTaUserId) {
-        this.replyTaUserId = replyTaUserId;
+    
+    public void setUuid(Integer uuid) {
+        this.uuid = uuid;
     }
-
-    public String getReplyTaUserName() {
-        return replyTaUserName;
+    
+    public String getUuidType() {
+        return uuidType;
     }
-
-    public void setReplyTaUserName(String replyTaUserName) {
-        this.replyTaUserName = replyTaUserName == null ? null : replyTaUserName.trim();
+    
+    public void setUuidType(String uuidType) {
+        this.uuidType = uuidType;
     }
-
+    
+    public String getUuidName() {
+        return uuidName;
+    }
+    
+    public void setUuidName(String uuidName) {
+        this.uuidName = uuidName;
+    }
+    
+    public String getUuidRole() {
+        return uuidRole;
+    }
+    
+    public void setUuidRole(String uuidRole) {
+        this.uuidRole = uuidRole;
+    }
+    
+    public Integer getReplyUuid() {
+        return replyUuid;
+    }
+    
+    public void setReplyUuid(Integer replyUuid) {
+        this.replyUuid = replyUuid;
+    }
+    
+    public String getReplyUuidType() {
+        return replyUuidType;
+    }
+    
+    public void setReplyUuidType(String replyUuidType) {
+        this.replyUuidType = replyUuidType;
+    }
+    
+    public String getReplyUuidName() {
+        return replyUuidName;
+    }
+    
+    public void setReplyUuidName(String replyUuidName) {
+        this.replyUuidName = replyUuidName;
+    }
+    
+    public String getReplyUuidRole() {
+        return replyUuidRole;
+    }
+    
+    public void setReplyUuidRole(String replyUuidRole) {
+        this.replyUuidRole = replyUuidRole;
+    }
+    
     public Date getCreateDate() {
         return createDate;
     }
@@ -172,4 +249,12 @@ public class TpTransactionReply {
     public void setReplyRoleName(String replyRoleName) {
         this.replyRoleName = replyRoleName;
     }
+    
+    public String getCreateUserName() {
+        return createUserName;
+    }
+    
+    public void setCreateUserName(String createUserName) {
+        this.createUserName = createUserName;
+    }
 }

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

@@ -300,13 +300,15 @@ public class SocialServiceImpl implements SocialServiceI {
         List<TpTransaction> tpTransactions = tpTransactionMapper.findAllTransaction(communityId, transactionTitle, type);
 
         tpTransactions.stream().forEach(e -> {
-            if (null != e.getTaUserVerifyId()) {
-                TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(e.getTaUserVerifyId());
+            if (e.getUuidType().equals("app")) {
+                TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerifyMapper.selectByPrimaryKey(e.getUuid()).getRoleId());
                 e.setRoleId(taSysRole.getId());
                 e.setRoleName(taSysRole.getRoleName());
             }
-            TaUser taUser = taUserMapper.selectByPrimaryKey(e.getTaUserId());
-            e.setCreateUserName(taUser.getUserName());
+            if (e.getUuidType().equals("prop")) {
+                e.setRoleName("物业");
+            }
+            e.setCreateUserName(e.getUuidName());
         });
 
         parameter.put("list", tpTransactions);
@@ -333,14 +335,15 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransaction.setTransactionContent(transactionContent);
         tpTransaction.setType(type);
         tpTransaction.setCommunityId(userElement.getCommunityId());
-        tpTransaction.setTaUserId(userElement.getId());
+        tpTransaction.setUuid(userElement.getUserVerifyId());
+        tpTransaction.setUuidType("app");
+        tpTransaction.setUuidName(userElement.getUserName());
         tpTransaction.setCreateUser(userElement.getId());
         tpTransaction.setStatus("1");
         tpTransaction.setCreateDate(new Date());
         tpTransaction.setUpdateUser(userElement.getId());
         tpTransaction.setUpdateDate(new Date());
         TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
-        tpTransaction.setTaUserVerifyId(taUserVerify.getRoleId());
         tpTransaction.setRoomNoName(taUserVerify.getRoomNoName());
         tpTransaction.setIsReported("0");
         // 发布者身份  0 APP  1 物业
@@ -394,7 +397,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
         Map<String, Object> parameter = Maps.newHashMap();
         Page<TpTransaction> pageLsit = PageHelper.startPage(pageNum, paeSize);
-        List<TpTransaction> tpTransactions = tpTransactionMapper.selectTransaction(userElement.getId(), userElement.getCommunityId(), type);
+        List<TpTransaction> tpTransactions = tpTransactionMapper.selectTransaction(userElement.getUserVerifyId(), userElement.getCommunityId(), type);
 
         tpTransactions.stream().forEach(e -> {
             // 角色
@@ -425,7 +428,7 @@ public class SocialServiceImpl implements SocialServiceI {
         transaction.setTransactionContent(tpTransaction.getTransactionContent());
 
 
-        if (null != transaction && userId.equals(transaction.getTaUserId())) {
+        if (null != transaction && userId.equals(transaction.getUuid()) && transaction.getUuidType().equals("app")) {
             tdImagesMapper.deleteTdImages(Integer.valueOf(id), Constant.TRANSACTION);
 
             insertTdImage(transaction, imageUrl, userId, Constant.TRANSACTION);
@@ -441,7 +444,7 @@ public class SocialServiceImpl implements SocialServiceI {
     public ResponseBean deleteransaction(Integer id, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
         TpTransaction tpTransaction = tpTransactionMapper.getById(Integer.valueOf(id));
-        if (null != tpTransaction && userElement.getId().equals(tpTransaction.getTaUserId())) {
+        if (null != tpTransaction && userElement.getUserVerifyId().equals(tpTransaction.getUuid()) && tpTransaction.getUuidType().equals("app")) {
             tpTransaction.setStatus("0");
             tpTransaction.setUpdateDate(new Date());
             tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
@@ -564,20 +567,19 @@ public class SocialServiceImpl implements SocialServiceI {
         }
         TpTransactionReply tpTransactionReply = JSONObject.parseObject(paramets, TpTransactionReply.class);
         tpTransactionReply.setCommunityId(userElement.getCommunityId());
-        tpTransactionReply.setTaUserId(userElement.getId());
-        tpTransactionReply.setTaUserName(userElement.getUserName());
+        tpTransactionReply.setUuid(userElement.getUserVerifyId());
+        tpTransactionReply.setUuidType("app");
+        tpTransactionReply.setUuidName(userElement.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.setReplyUuid(tpTransaction.getUuid());
+        tpTransactionReply.setReplyUuidType(tpTransaction.getUuidType());
+        tpTransactionReply.setReplyUuidName(tpTransaction.getUuidName());
         tpTransactionReply.setReleaseIdentity("0");
         TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
-        tpTransactionReply.setTaUserVerifyId(taUserVerify.getRoleId());
-        tpTransactionReply.setRoomNoName(taUserVerify.getRoomNoName());
         tpTransactionReply.setCreateDate(new Date());
         tpTransactionReplyMapper.insert(tpTransactionReply);
 
@@ -679,12 +681,12 @@ public class SocialServiceImpl implements SocialServiceI {
         TpTransactionReply tpTransactionReply = new TpTransactionReply();
         tpTransactionReply.setCommunityId(userElement.getCommunityId());
         tpTransactionReply.setTransactionId(transactionId);
-        tpTransactionReply.setTaUserId(userElement.getId());
-        tpTransactionReply.setTaUserName(userElement.getUserName());
+        //tpTransactionReply.setTaUserId(userElement.getId());
+        //tpTransactionReply.setTaUserName(userElement.getUserName());
         tpTransactionReply.setReleaseIdentity("0");
-        tpTransactionReply.setReplyContent(replyContent);
-        tpTransactionReply.setReplyTaUserId(replyUserId);
-        tpTransactionReply.setReplyTaUserName(userName);
+        //tpTransactionReply.setReplyContent(replyContent);
+        //tpTransactionReply.setReplyTaUserId(replyUserId);
+        //tpTransactionReply.setReplyTaUserName(userName);
         tpTransactionReply.setCreateDate(new Date());
         response.addSuccess("成功");
         tpTransactionReplyMapper.insert(tpTransactionReply);
@@ -833,9 +835,15 @@ public class SocialServiceImpl implements SocialServiceI {
         }
 
         TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(activityId, communityId);
-        TaUser taUser = taUserMapper.selectByPrimaryKey(tpTransaction.getTaUserId());
-        tpTransaction.setTelephone(taUser.getLoginName());
-        tpTransaction.setCreateUserName(taUser.getUserName());
+        if (tpTransaction.getUuidType().equals("app")) {
+            TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerifyMapper.selectByPrimaryKey(tpTransaction.getUuid()).getRoleId());
+            tpTransaction.setRoleId(taSysRole.getId());
+            tpTransaction.setRoleName(taSysRole.getRoleName());
+        }
+        if (tpTransaction.getUuidType().equals("prop")) {
+            tpTransaction.setRoleName("物业");
+        }
+        tpTransaction.setCreateUserName(tpTransaction.getUuidName());
 
         Map<String, Object> map = Maps.newHashMap();
         map.put("uuid", tpTransaction.getId());
@@ -908,9 +916,17 @@ public class SocialServiceImpl implements SocialServiceI {
 
         PageHelper.startPage(pageNum, pageSize, "create_date " + order);
         //房间号
-         TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
-        List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId, userElement.getId(), tpTransaction.getCreateUser(),type,taUserVerify.getRoomNoName());
+        TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId, userElement.getUserVerifyId(), tpTransaction.getUuid(),tpTransaction.getUuidType(),type);
         for (TpTransactionReply tpTransactionReply : replies) {
+            if (tpTransactionReply.getUuidType().equals("app")) {
+                TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerifyMapper.selectByPrimaryKey(tpTransactionReply.getUuid()).getRoleId());
+                tpTransactionReply.setRoleName(taSysRole.getDescription());
+            }
+            if (tpTransactionReply.getUuidType().equals("prop")) {
+                tpTransactionReply.setRoleName("物业");
+            }
+            tpTransactionReply.setCreateUserName(tpTransactionReply.getUuidName());
             List<TdImages> tdImagesList = tdImagesMapper.selectImages(tpTransactionReply.getId(), "reply");
             List<String> list = new ArrayList<>();
             for (TdImages imageUrl : tdImagesList) {

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

@@ -134,7 +134,7 @@
     SELECT * FROM
     tp_transaction_like
     WHERE community_id = #{communityId,jdbcType=INTEGER}
-    and   ta_user_id = #{userId,jdbcType=INTEGER}
+    and   ta_user_verify_id = #{userId,jdbcType=INTEGER}
     and   transaction_id = #{invitationId,jdbcType=INTEGER}
   </select>
 </mapper>

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

@@ -4,7 +4,9 @@
     <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTransaction">
         <id column="id" property="id" jdbcType="INTEGER"/>
         <result column="community_id" property="communityId" jdbcType="INTEGER"/>
-        <result column="ta_user_id" property="taUserId" jdbcType="INTEGER"/>
+        <result column="uuid" property="uuid" jdbcType="INTEGER"/>
+        <result column="uuid_name" property="uuidName" jdbcType="VARCHAR"/>
+        <result column="uuid_type" property="uuidType" jdbcType="VARCHAR"/>
         <result column="transaction_title" property="transactionTitle" jdbcType="VARCHAR"/>
         <result column="transaction_content" property="transactionContent" jdbcType="VARCHAR"/>
         <result column="sort" property="sort" jdbcType="VARCHAR"/>
@@ -17,38 +19,18 @@
         <result column="update_date" property="updateDate" jdbcType="TIMESTAMP"/>
         <result column="role_id" property="roleId" jdbcType="INTEGER"/>
         <result column="role_name" property="roleName" jdbcType="VARCHAR"/>
-        <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER"/>
         <result column="release_identity" property="releaseIdentity" jdbcType="VARCHAR"/>
         <result column="room_no_name" property="roomNoName" jdbcType="VARCHAR"/>
 
     </resultMap>
     <sql id="Base_Column_List">
-    id, community_id, ta_user_id, transaction_title, transaction_content, sort,
-    view_count, status, type, create_user, create_date, update_user, update_date, ta_user_verify_id, release_identity,room_no_name
+    id, community_id, transaction_title, transaction_content, sort,uuid,uuid_type,uuid_name,
+    view_count, status, type, create_user, create_date, update_user, update_date, release_identity,room_no_name
   </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpTransaction">
-    SELECT
-	ttr.id,
-	ttr.community_id,
-	ttr.ta_user_id,
-	ttr.transaction_title,
-	ttr.transaction_content,
-	ttr.sort,
-	ttr.view_count,
-	ttr.STATUS,
-	ttr.type,
-	ttr.create_user,
-	ttr.create_date,
-	ttr.update_user,
-	ttr.update_date,
-	sr.id AS role_id,
-	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
+    select
+    <include refid="Base_Column_List"/>
+    from tp_transaction ttr
     where ttr.id = #{id,jdbcType=INTEGER} and ttr.community_id=#{communityId,jdbcType=INTEGER}
   </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
@@ -80,8 +62,14 @@
             <if test="communityId != null">
                 community_id,
             </if>
-            <if test="taUserId != null">
-                ta_user_id,
+            <if test="uuid != null">
+                uuid,
+            </if>
+            <if test="uuidType != null">
+                uuid_type,
+            </if>
+            <if test="uuidName != null">
+                uuid_Name,
             </if>
             <if test="transactionTitle != null">
                 transaction_title,
@@ -116,9 +104,6 @@
             <if test="updateDate != null">
                 update_date,
             </if>
-            <if test="taUserVerifyId != null">
-                ta_user_verify_id,
-            </if>
             <if test="releaseIdentity != null">
                 release_identity,
             </if>
@@ -133,8 +118,14 @@
             <if test="communityId != null">
                 #{communityId,jdbcType=INTEGER},
             </if>
-            <if test="taUserId != null">
-                #{taUserId,jdbcType=INTEGER},
+            <if test="uuid != null">
+                #{uuid,jdbcType=INTEGER},
+            </if>
+            <if test="uuidType != null">
+                #{uuidType,jdbcType=INTEGER},
+            </if>
+            <if test="uuidName != null">
+                #{uuidName,jdbcType=INTEGER},
             </if>
             <if test="transactionTitle != null">
                 #{transactionTitle,jdbcType=VARCHAR},
@@ -169,9 +160,6 @@
             <if test="updateDate != null">
                 #{updateDate,jdbcType=TIMESTAMP},
             </if>
-            <if test="taUserVerifyId != null">
-                #{taUserVerifyId,jdbcType=INTEGER},
-            </if>
             <if test="releaseIdentity != null">
                 #{releaseIdentity,jdbcType=VARCHAR},
             </if>
@@ -186,9 +174,6 @@
             <if test="communityId != null">
                 community_id = #{communityId,jdbcType=INTEGER},
             </if>
-            <if test="taUserId != null">
-                ta_user_id = #{taUserId,jdbcType=INTEGER},
-            </if>
             <if test="transactionTitle != null">
                 transaction_title = #{transactionTitle,jdbcType=VARCHAR},
             </if>
@@ -267,36 +252,19 @@
         <include refid="Base_Column_List"/>
         FROM
         tp_transaction t
-        WHERE t.create_user=#{id,jdbcType=INTEGER}
-        AND t.community_id=#{communityId,jdbcType=INTEGER}
-        UNION ALL
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM
-        tp_transaction t
-        INNER JOIN(SELECT
-        y.transaction_id
-        FROM
-        tp_transaction_reply y
-        LEFT JOIN tp_transaction t ON y.transaction_id = t.id
         WHERE
-        y.ta_user_id = #{id,jdbcType=INTEGER}
+          t.community_id=#{communityId,jdbcType=INTEGER}
+        AND t.uuid = #{id} and t.uuid_type = 'app'
         <if test="type != null and type != ''">
             and t.type = #{type,jdbcType=INTEGER}
         </if>
-        AND y.community_id = #{communityId,jdbcType=INTEGER}
-        AND t.status = 1
-        AND y.transaction_id NOT IN ( SELECT t.id FROM tp_transaction t WHERE t.create_user = #{id,jdbcType=INTEGER} AND
-        t.community_id = #{communityId,jdbcType=INTEGER} )
-        GROUP BY
-        y.transaction_id) a ON a.transaction_id = t.id
         order by create_date DESC
     </select>
 
     <update id="updateTransaction" parameterType="com.community.huiju.model.TpTransaction">
     update tp_transaction
     set
-    ta_user_id = #{userId,jdbcType=INTEGER},
+    uuid = #{userId,jdbcType=INTEGER},
     transaction_title = #{transactionTitle,jdbcType=VARCHAR},
     transaction_content = #{transactionContent,jdbcType=VARCHAR},
     update_user = #{userId,jdbcType=INTEGER},

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

@@ -4,15 +4,16 @@
   <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTransactionReply" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="uuid" property="uuid" jdbcType="INTEGER" />
+    <result column="uuid_type" property="uuidType" jdbcType="VARCHAR" />
+    <result column="uuid_name" property="uuidName" jdbcType="VARCHAR" />
+    <result column="reply_uuid" property="replyUuid" jdbcType="INTEGER" />
+    <result column="reply_uuid_type" property="replyUuidType" jdbcType="VARCHAR" />
+    <result column="reply_uuid_name" property="replyUuidName" jdbcType="VARCHAR" />
     <result column="transaction_id" property="transactionId" jdbcType="INTEGER" />
-    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
-    <result column="ta_user_name" property="taUserName" jdbcType="VARCHAR" />
     <result column="reply_content" property="replyContent" jdbcType="VARCHAR" />
-    <result column="reply_ta_user_id" property="replyTaUserId" jdbcType="INTEGER" />
-    <result column="reply_ta_user_name" property="replyTaUserName" jdbcType="VARCHAR" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="release_identity" property="releaseIdentity" jdbcType="VARCHAR" />
-    <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
     <result column="room_no_name" property="roomNoName" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
@@ -30,13 +31,13 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpTransactionReply" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
-    insert into tp_transaction_reply (id, community_id, transaction_id,ta_user_verify_id,release_identity,
-      ta_user_id, ta_user_name, reply_content, 
-      reply_ta_user_id, reply_ta_user_name, create_date,room_no_name
+    insert into tp_transaction_reply (id, community_id, transaction_id,uuid,uuid_type,
+      uuid_name, reply_content,
+      reply_uuid, reply_uuid_type,reply_uuid_name, create_date,release_identity
       )
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER},#{taUserVerifyId},#{releaseIdentity},
-      #{taUserId,jdbcType=INTEGER}, #{taUserName,jdbcType=VARCHAR}, #{replyContent,jdbcType=VARCHAR},
-      #{replyTaUserId,jdbcType=INTEGER}, #{replyTaUserName,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},#{roomNoName,jdbcType=VARCHAR}
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER},#{uuid},#{uuidType},
+      #{uuidName,jdbcType=VARCHAR}, #{replyContent,jdbcType=VARCHAR}, #{replyUuid,jdbcType=INTEGER},
+      #{replyUuidType,jdbcType=VARCHAR}, #{replyUuidName,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},#{releaseIdentity,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpTransactionReply" >
@@ -163,21 +164,24 @@
   </update>
   <select id="getCommunityIdAndTransactionId" resultMap="BaseResultMap">
     SELECT
-	tr.*, (SELECT r.description FROM ta_sys_role r  where r.id = tr.ta_user_verify_id) AS taRoleName,
-	      (SELECT tsr.role_name FROM ta_sys_user_role tsur LEFT JOIN ta_sys_role tsr ON tsur.role_id = tsr.id WHERE tsur.user_id = tr.reply_ta_user_id) AS replyRoleName
+      *
     FROM
-        tp_transaction_reply tr
+    tp_transaction_reply  tr
     WHERE
 	tr.community_id = #{communityId}
     and tr.transaction_id=#{transactionId}
       <if test="type == 2" >
-        AND release_identity=1
+        AND tr.uuid_type = "prop"
       </if>
       <if test="type == 1" >
-        AND  tr.ta_user_id = #{founderUserID}
+        AND (tr.uuid = #{uuid} OR tr.reply_uuid = #{uuid})
+        AND tr.uuid_type =  #{uuidType}
+        AND tr.reply_uuid_type =  #{uuidType}
       </if>
       <if test="type == 0" >
-        AND (tr.ta_user_id = #{founderUserID} OR tr.reply_ta_user_id = #{founderUserID})
+        AND (tr.uuid = #{userID} OR tr.reply_uuid = #{userID})
+        AND tr.uuid_type = 'app'
+        AND tr.reply_uuid_type = 'app'
       </if>
    </select>
    <select id="selectUserTransactionReply" resultMap="BaseResultMap">

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/CommunityServiceImpl.java

@@ -74,18 +74,18 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		}
 
 
-		Map<String,Object> map = Maps.newHashMap();
-		map.put("loginName", toCommunities.getLoginName());
-		TaUser taUser = taUserMapper.selectByLoginName(map);
-		if (null == taUser) {
-			//时维护ta_user（发帖需要）
-			taUser= new TaUser();
-			taUser.setLoginName(toCommunities.getLoginName());
-			taUser.setCreateDate(new Date());
-			taUser.setUserName(toCommunities.getUserName());
-			taUser.setStatus("1");
-			taUserMapper.insert(taUser);
-		}
+		//Map<String,Object> map = Maps.newHashMap();
+		//map.put("loginName", toCommunities.getLoginName());
+		//TaUser taUser = taUserMapper.selectByLoginName(map);
+		//if (null == taUser) {
+		//	//时维护ta_user（发帖需要）
+		//	taUser= new TaUser();
+		//	taUser.setLoginName(toCommunities.getLoginName());
+		//	taUser.setCreateDate(new Date());
+		//	taUser.setUserName(toCommunities.getUserName());
+		//	taUser.setStatus("1");
+		//	taUserMapper.insert(taUser);
+		//}
 
 
 
@@ -99,7 +99,7 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		tpUser.setCreateUser(1);
 		tpUser.setCommunityId(toCommunities.getId());
 		tpUser.setStatus(Constant.EFFECTIVE);
-		tpUser.setTaUserId(taUser.getId());
+		//tpUser.setTaUserId(taUser.getId());
 		//插入用户信息
 		tpUserMapper.insertSelective(tpUser);
 		//维护此用户的角色

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TransactionController.java

@@ -88,7 +88,7 @@ public class TransactionController extends BaseController {
 	@RequestMapping(value="/transactions/add",method = RequestMethod.POST)
 	public ResponseBean transactionsAdd(@RequestBody String paramets, HttpSession session){
 		UserElement userElement = getUserElement(session);
-		ResponseBean  addAnnouncement= transactionService.transactionsAdd(paramets,userElement.getCommunityId(),userElement.getId());
+		ResponseBean  addAnnouncement= transactionService.transactionsAdd(paramets,userElement);
 		return addAnnouncement;
 	}
 
@@ -122,7 +122,7 @@ public class TransactionController extends BaseController {
 	@RequestMapping(value="/transactionReplyList",method = RequestMethod.POST)
 	public ResponseBean transactionReplyList(@RequestBody String paramets, HttpSession session){
 		UserElement userElement = getUserElement(session);
-		ResponseBean  transactionReplyList= transactionService.transactionReplyList(paramets,userElement.getCommunityId(),userElement.getId());
+		ResponseBean  transactionReplyList= transactionService.transactionReplyList(paramets,userElement);
 		return transactionReplyList;
 	}
 

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("taUserId") Integer taUserId, @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("uuid") Integer uuid,@Param("uuidType") String uuidType,@Param("userId") Integer userId, @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/model/TpTransaction.java

@@ -31,11 +31,21 @@ public class TpTransaction implements Serializable {
      * 小区id
      */
     private Integer communityId;
-
+    
     /**
-     * 住户app的用户id
+     * 身份ID 根据uuid_type区分是物业端TP_USER_ID还是TA_USER_VERIFY_ID
      */
-    private Integer taUserId;
+    private Integer uuid;
+    
+    /**
+     * app/prop
+     */
+    private String uuidType;
+    
+    /**
+     * 话题发布人
+     */
+    private String uuidName;
 
     /**
      * 交易标题
@@ -86,12 +96,6 @@ public class TpTransaction implements Serializable {
      * 更新时间
      */
     private LocalDateTime updateDate;
-    
-    /**
-     * 创建人
-     */
-    @TableField(exist = false)
-    private String userName;
 
     /**
      * 喜欢的总数

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TransactionReply.java

@@ -34,42 +34,62 @@ public class TransactionReply implements Serializable {
      * 小区id
      */
     private Integer communityId;
-
+    
     /**
      * 交易帖子ID
      */
     private Integer transactionId;
-
+    
     /**
-     * 回复帖子的住户APP端的用户ID
+     * 回复帖子的ID,根据uuid_type区分物业端app端
      */
-    private Integer taUserId;
-
+    private Integer uuid;
+    
     /**
-     * 回复帖子的住户APP端的用户姓名
+     * app/prop
      */
-    private String taUserName;
-
+    private String uuidType;
+    
     /**
-     * 0代表app端用户，1代表物业端用户，
+     * 回复帖子的姓名
      */
-    private String releaseIdentity;
-
+    private String uuidName;
+    
+    /**
+     * 回复帖子的角色
+     */
+    private String uuidRole;
+    
     /**
      * 回复内容
      */
     private String replyContent;
-
+    
     /**
-     * 被回复的评论内容的住户App端用户ID
+     * 被回复的评论内容的用户ID根据uuidtype区分
      */
-    private Integer replyTaUserId;
-
+    private Integer replyUuid;
+    
     /**
-     * 被回复的评论内容的住户App端用户姓名
+     * app/prop
      */
-    private String replyTaUserName;
-
+    private String replyUuidType;
+    
+    /**
+     * 被回复的评论内容的姓名
+     */
+    private String replyUuidName;
+    
+    /**
+     * 被回复的评论人的角色
+     */
+    private String replyUuidRole;
+    
+    /**
+     * 发布者身份
+     */
+    private String releaseIdentity;
+    
     /**
      * 创建时间
      */

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

@@ -34,11 +34,10 @@ public interface ITransactionService extends IService<TpTransaction> {
 	/**
 	 * 添加二手话题
 	 * @param paramets
-	 * @param communityId
-	 * @param id
+	 * @param userElement
 	 * @return
 	 */
-    ResponseBean transactionsAdd(String paramets, Integer communityId, Integer id);
+    ResponseBean transactionsAdd(String paramets, UserElement userElement);
 
 	/**
 	 * 修改二手交易
@@ -61,11 +60,10 @@ public interface ITransactionService extends IService<TpTransaction> {
 	/**
 	 * 二手帖子评论列表
 	 * @param paramets
-	 * @param communityId
-	 * @param id
+	 * @param userElement
 	 * @return
 	 */
-	ResponseBean transactionReplyList(String paramets, Integer communityId, Integer id);
+	ResponseBean transactionReplyList(String paramets, UserElement userElement);
 
 	/**
 	 * 删除二手帖子评论

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

@@ -151,17 +151,20 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 	}
 
 	@Override
-	public ResponseBean transactionsAdd(String paramets, Integer communityId, Integer id) {
+	public ResponseBean transactionsAdd(String paramets, UserElement userElement) {
+		Integer communityId = userElement.getCommunityId();
+		Integer id = userElement.getId();
 		ResponseBean response = new ResponseBean();
 
 		JSONObject jsonobject = JSONObject.parseObject(paramets);
 
 		TpTransaction tpTransaction = JSONObject.parseObject(paramets, TpTransaction.class);
 		tpTransaction.setCommunityId(communityId);
-		tpTransaction.setTaUserId(userMapper.selectById(id).getTaUserId());
+		tpTransaction.setUuid(id);
+		tpTransaction.setUuidType("prop");
+		tpTransaction.setUuidName(userElement.getUserName());
 		tpTransaction.setCreateDate(LocalDateTime.now());
-		// 必须与ta_user表的id数据同步。
-		tpTransaction.setCreateUser(userMapper.selectById(id).getTaUserId());
+		tpTransaction.setCreateUser(id);
 		tpTransaction.setViewCount(0);
 		tpTransaction.setIsReported("0");
 		tpTransaction.setReleaseIdentity("1");
@@ -198,10 +201,8 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 
 		TpTransaction tpTransaction = JSONObject.parseObject(paramets, TpTransaction.class);
 		tpTransaction.setCommunityId(communityId);
-		tpTransaction.setTaUserId(userMapper.selectById(id).getTaUserId());
 		tpTransaction.setUpdateDate(LocalDateTime.now());
-		// 必须与ta_user表的id数据同步。
-		tpTransaction.setUpdateUser(userMapper.selectById(id).getTaUserId());
+		tpTransaction.setUpdateUser(id);
 		tpTransactionMapper.updateById(tpTransaction);
 		JSONArray contentImg = jsonobject.getJSONArray("contentImg");
 
@@ -259,7 +260,9 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 	}
 
 	@Override
-	public ResponseBean transactionReplyList(String paramets, Integer communityId, Integer userID) {
+	public ResponseBean transactionReplyList(String paramets, UserElement userElement) {
+		Integer communityId = userElement.getCommunityId();
+		Integer userID = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
 		JSONObject object= JSONObject.parseObject(paramets);
 		Integer transactionId = object.getInteger("id");
@@ -276,9 +279,9 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		page.setSize(pageSize == null ? 10 : pageSize);
 		page.setCurrent(pageNum == null ? 1 : pageNum);
 		// 获得aap的id
-		Integer taUserId= userMapper.selectById(userID).getTaUserId();
+		TpTransaction tpTransaction = tpTransactionMapper.selectById(transactionId);
 		// 分页查询
-		List<TransactionReply> TransactionReplylList = transactionReplyMapper.transactionReplyList(page,transactionId,taUserId,status,taUserName,createDate,replyTaUserName);
+		List<TransactionReply> TransactionReplylList = transactionReplyMapper.transactionReplyList(page,transactionId,tpTransaction.getUuid(),tpTransaction.getUuidType(),userID,status,taUserName,createDate,replyTaUserName);
 		//查询帖子评论所带图片
 
 		for (TransactionReply transactionReply:TransactionReplylList){
@@ -338,23 +341,25 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		if (Type==1) {
 			transactionReply.setCommunityId(userElement.getCommunityId())
 					.setTransactionId(id)
-					.setTaUserId(user.getTaUserId())
-					.setTaUserName(userElement.getUserName())
+					.setUuid(userElement.getId())
+					.setUuidType("prop")
+					.setUuidName(userElement.getUserName())
 					.setReplyContent(replyContent)
-					.setReplyTaUserId(tpTransaction.getCreateUser())
-					.setReleaseIdentity("1")
-					.setReplyTaUserName(taUserMapper.selectById(tpTransaction.getTaUserId()).getUserName())
+					.setReplyUuid(tpTransaction.getUuid())
+					.setReplyUuidType(tpTransaction.getUuidType())
+					.setReplyUuidName(tpTransaction.getUuidName())
 					.setCreateDate(LocalDateTime.now());
 		}
 		if (Type!=1) {
 			transactionReply.setCommunityId(userElement.getCommunityId())
 					.setTransactionId(Reply.getTransactionId())
-					.setTaUserId(userElement.getId())
-					.setTaUserName(userElement.getUserName())
+					.setUuid(userElement.getId())
+					.setUuidType("prop")
+					.setUuidName(userElement.getUserName())
 					.setReplyContent(replyContent)
-					.setReplyTaUserId(Reply.getTaUserId())
-					.setReleaseIdentity("1")
-					.setReplyTaUserName(Reply.getTaUserName())
+					.setReplyUuid(Reply.getUuid())
+					.setReplyUuidType("prop")
+					.setReplyUuidName(Reply.getReplyUuidName())
 					.setCreateDate(LocalDateTime.now());
 		}
 		transactionReplyMapper.insert(transactionReply);

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

@@ -12,14 +12,13 @@
         t.create_user,
         t.is_reported AS isReported,
         t.create_date AS createDate,
-        ta.user_name AS userName,
-        COUNT(li.transaction_id) AS  transactionLikeSum,
-        COUNT(re.transaction_id) AS replySum
+        t.uuid_name AS uuidName,
+        COUNT( li.transaction_id ) AS transactionLikeSum,
+        COUNT( re.transaction_id ) AS replySum
         FROM
         tp_transaction t
-        LEFT JOIN ta_user ta ON  t.ta_user_id = ta.id
-        LEFT JOIN ta_visitor v ON ta.id = v.ta_user_id
-        LEFT JOIN tp_transaction_like li ON t.id = li.transaction_id AND li.like_status=1
+        LEFT JOIN tp_transaction_like li ON t.id = li.transaction_id
+        AND li.like_status = 1
         LEFT JOIN tp_transaction_reply re ON t.id = re.transaction_id
         WHERE t.community_id =#{communityId}
         <if test="id != null and id != '' or id ==0">
@@ -32,7 +31,7 @@
             and t.type = #{status,jdbcType=VARCHAR}
         </if>
         <if test="userName != null and userName != ''">
-            and ta.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%')
+            and t.uuid_name like concat('%',#{userName,jdbcType=VARCHAR},'%')
         </if>
         GROUP BY
         t.id

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

@@ -6,44 +6,35 @@
         re.id,
         re.community_id,
         re.transaction_id,
-        re.ta_user_id,
-        re.ta_user_name,
+        re.uuid_name,
         re.reply_content,
-        re.reply_ta_user_id,
-        re.reply_ta_user_name,
+        re.reply_uuid_name,
         re.create_date
     FROM
-        tp_transaction tr
-    LEFT JOIN tp_transaction_reply re ON tr.id = re.transaction_id
-    <if test="status == 1 ">
-    LEFT JOIN tp_user u ON re.reply_ta_user_id = u.ta_user_id
-    </if>
+        tp_transaction_reply re
     WHERE
-        tr.id = #{id}
-    <if test="status == 1 ">
-     AND  re.reply_ta_user_id = u.ta_user_id
+        re.transaction_id = #{id}
+    <if test="taUserName != null and taUserName !=''">
+        and re.uuid_name like concat('%',#{ taUserName,jdbcType=VARCHAR},'%')
     </if>
-    <if test="status == 0 ">
-    AND re.reply_ta_user_id = #{taUserId,jdbcType=INTEGER}
+    <if test="replyTaUserName != null and replyTaUserName !=''">
+        and re.reply_uuid_name like concat('%',#{ replyTaUserName,jdbcType=VARCHAR},'%')
     </if>
-    <if test="status == 2 ">
-    AND re.release_identity = 1
+    <if test="createDate != null">
+        and  date_format(re.create_date,'%Y%m%d')=date_format(#{createDate},'%Y%m%d')
     </if>
-
-    <if test="status == 3 ">
-    AND re.ta_user_id = #{taUserId,jdbcType=INTEGER}
+    <if test="status == 0 ">
+        AND re.reply_uuid = #{userId,jdbcType=INTEGER} and re.reply_uuid_type = "prop"
     </if>
-
-    <if test="taUserName != null and taUserName !=''">
-        and re.ta_user_name like concat('%',#{ taUserName,jdbcType=VARCHAR},'%')
+    <if test="status == 1 ">
+        AND  re.reply_uuid_type = "prop"
     </if>
-
-    <if test="replyTaUserName != null and replyTaUserName !=''">
-        and re.reply_ta_user_name like concat('%',#{ replyTaUserName,jdbcType=VARCHAR},'%')
+    <if test="status == 2 ">
+        AND re.uuid_type = "prop"
     </if>
 
-    <if test="createDate != null">
-        and  date_format(re.create_date,'%Y%m%d')=date_format(#{createDate},'%Y%m%d')
+    <if test="status == 3 ">
+        AND re.uuid = #{uuid,jdbcType=INTEGER} and re.uuid_type = #{uuidType,jdbcType=INTEGER}
     </if>
     order by re.create_date desc
     </select>

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

@@ -54,9 +54,12 @@
       <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.transactionTitle }}</span></a></template>
       </el-table-column>
       <el-table-column prop="status" label="是否作废" align="center">
-      <template slot-scope="scope">{{ scope.row.status=='0'?'已作废':'' }}</template>
+      <template slot-scope="scope">
+          <span v-if="scope.row.status =='0'">已作废</span>
+          <span v-if="scope.row.status =='1'">已发布</span>
+      </template>
       </el-table-column>
-      <el-table-column prop="userName" label="发布人" align="center"/>
+      <el-table-column prop="uuidName" label="发布人" align="center"/>
       <el-table-column prop="createDate" label="发布时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
 
       <el-table-column prop="viewCount" label="查看人数" align="center"/>

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

@@ -46,14 +46,14 @@
       <el-table-column
         type="selection"
         width="55"/>
-      <el-table-column prop="taUserName" label="回复人" align="center"/>
+      <el-table-column prop="uuidName" label="回复人" align="center"/>
        <el-table-column prop="replyContent" label="回复内容" align="center"/>
       <el-table-column prop="transactionTitle" label="回复配图" align="center">
            <template slot-scope="scope">
              <img v-for="sr in scope.row.tdImagesLists" :src="sr" preview  width="50" height="50">
            </template>
       </el-table-column>
-      <el-table-column prop="replyTaUserName" label="被回复人" align="center"/>
+      <el-table-column prop="replyUuidName" label="被回复人" align="center"/>
       <el-table-column prop="createDate" label="时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
       <el-table-column prop="viewCount" label="操作" align="center">
       <template slot-scope="scope"><a><span style="color: #63B8FF" @click="TransactionReplyOpen(scope.row.id)">{{ '回复此回复' }}</span></a></template>