合并

CODE/smart-community/app-api/pom.xml

@@ -249,6 +249,15 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.4.2</version>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

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

@@ -45,6 +45,20 @@ public class TpTransactionReply {
      */
     private String releaseIdentity;
 
+    /**
+     * 用于查询app端角色，物业端不维护
+     * @param releaseIdentity
+     */
+    private  Integer taUserVerifyId;
+
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
+    }
+
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
+    }
+
     public void setReleaseIdentity(String releaseIdentity) {
         this.releaseIdentity = releaseIdentity;
     }

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

@@ -627,6 +627,7 @@ public class SocialServiceImpl implements SocialServiceI {
             tpTransactionReply.setReplyTaUserName(taUserMapper.selectByPrimaryKey(tpTransactionReply.getReplyTaUserId()).getUserName());
         }
         tpTransactionReply.setReleaseIdentity("0");
+        tpTransactionReply.setTaUserVerifyId(userElement.getUserVerifyId());
         tpTransactionReply.setCreateDate(new Date());
         tpTransactionReplyMapper.insert(tpTransactionReply);
 

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

@@ -11,9 +11,12 @@
     <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" />
+
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, transaction_id, ta_user_id, ta_user_name, reply_content, reply_ta_user_id, 
+    id, community_id, transaction_id, ta_user_id, ta_user_name, reply_content, reply_ta_user_id,ta_user_verify_id
     reply_ta_user_name, create_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -27,12 +30,12 @@
     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, 
+    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
       )
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER}, 
-      #{taUserId,jdbcType=INTEGER}, #{taUserName,jdbcType=VARCHAR}, #{replyContent,jdbcType=VARCHAR}, 
+    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}
       )
   </insert>
@@ -66,6 +69,12 @@
       <if test="createDate != null" >
         create_date,
       </if>
+      <if test="releaseIdentity != null" >
+        release_identity,
+      </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -95,6 +104,12 @@
       <if test="createDate != null" >
         #{createDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="releaseIdentity != null" >
+        #{releaseIdentity},
+      </if>
+      <if test="taUserVerifyId != null" >
+        #{ taUserVerifyId}
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTransactionReply" >
@@ -141,7 +156,7 @@
   </update>
   <select id="getCommunityIdAndTransactionId" resultMap="BaseResultMap">
     SELECT
-	tr.*, (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.ta_user_id) AS taRoleName,
+	tr.*, (SELECT r.description FROM ta_user_verify uv LEFT JOIN ta_sys_role r ON uv.role_id = r.id WHERE uv.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

CODE/smart-community/community-common/pom.xml

@@ -124,5 +124,6 @@
             <version>2.6</version>
         </dependency>
 
+
     </dependencies>
 </project>

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

@@ -312,7 +312,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		 Integer id= object.getInteger("id");
 		 String replyContent= object.getString("replyContent");
 		 JSONArray array= object.getJSONArray("contentImg");
-		// 根据此状态判断是回复帖子，还是回复人
+		// 根据此状态判断是回复帖子，还是回复人(共用一个接口)
 		Integer replyType= object.getInteger("replyType")==null?0:1;
 
 		 // 查询帖子信息
@@ -328,6 +328,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 					.setTaUserName(userElement.getUserName())
 					.setReplyContent(replyContent)
 					.setReplyTaUserId(tpTransaction.getCreateUser())
+					.setReleaseIdentity("1")
 					.setReplyTaUserName(taUserMapper.selectById(tpTransaction.getTaUserId()).getUserName())
 					.setCreateDate(LocalDateTime.now());
 		}
@@ -338,6 +339,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 					.setTaUserName(userElement.getUserName())
 					.setReplyContent(replyContent)
 					.setReplyTaUserId(Reply.getTaUserId())
+					.setReleaseIdentity("1")
 					.setReplyTaUserName(Reply.getTaUserName())
 					.setCreateDate(LocalDateTime.now());
 		}