合并

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

@@ -21,6 +21,20 @@ public class TpTransactionReport {
      */
     private String reportName;
 
+    /**
+     * 举报人姓名
+     * @return
+     */
+    private String reportStringName;
+
+    public String getReportStringName() {
+        return reportStringName;
+    }
+
+    public void setReportStringName(String reportStringName) {
+        this.reportStringName = reportStringName;
+    }
+
     public String getReportName() {
         return reportName;
     }

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

@@ -597,9 +597,10 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransactionReply.setUuidRole(taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId()).getDescription());
 
         TpTransactionReply tpTransactionReplyBack = new TpTransactionReply();
+        TpTransaction tpTransaction = new TpTransaction();
         //replyId为空的情况下被回复人就是帖子的创建人
         if (StringUtils.isEmpty(tpTransactionReply.getReplyId())) {
-            TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(tpTransactionReply.getTransactionId(),tpTransactionReply.getCommunityId());
+              tpTransaction = tpTransactionMapper.selectByPrimaryKey(tpTransactionReply.getTransactionId(),tpTransactionReply.getCommunityId());
             //塞入被回复人信息
             tpTransactionReply.setReplyUuid(tpTransaction.getUuid());
             tpTransactionReply.setReplyUuidType(tpTransaction.getUuidType());
@@ -638,7 +639,8 @@ public class SocialServiceImpl implements SocialServiceI {
             }
         }
         // 推消息
-        TpMessage  tpMessage = new TpMessage(null,userElement.getCommunityId(),"9","1","1", tpTransactionReplyBack.getUuid(),"1","2",  userElement.getUserName()+":"+tpTransactionReply.getReplyContent(),
+        Integer uuId= "".equals(tpTransactionReplyBack.getUuid())?tpTransaction.getUuid():tpTransactionReplyBack.getUuid();
+        TpMessage  tpMessage = new TpMessage(null,userElement.getCommunityId(),"6","1","1", uuId,"1","2",  userElement.getUserName()+":"+tpTransactionReply.getReplyContent(),
                                           "1",null,null,"0",userElement.getUserVerifyId(),new Date(),null,null,null,null,null,tpTransactionReplyBack.getTransactionId());
         tpMessageMapper.insert(tpMessage);
         response.addSuccess("成功");

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

@@ -344,7 +344,7 @@
                 and is_reported = 1
             </if>
             <if test="ManageStatus == 2">
-                (read_status IS NULL or read_status = 2)
+                (read_status IS NULL or read_status = 0)
             </if>
             <if test="ManageStatus == 3">
                 and  read_status= 1

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

@@ -8,6 +8,9 @@
     <result column="report_reason_id" property="reportReasonId" jdbcType="VARCHAR" />
     <result column="reporter_id" property="reporterId" jdbcType="INTEGER" />
     <result column="reportName" property="reportName" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="reportStringName" property="reportStringName" jdbcType="VARCHAR" />
+
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, transaction_id, report_reason_id, reporter_id
@@ -109,15 +112,20 @@
   </select>
 
   <select id="transactionReplyList" resultMap="BaseResultMap">
-    SELECT
-    tr.id,
-	tr.community_id,
-	tr.transaction_id,
-	tr.report_reason_id,
-	tr.reporter_id,
-	rr.reason as reportName
-	from tp_transaction_report tr
-    left join sys_report_reason rr on tr.report_reason_id = rr.id
+      SELECT
+          tr.id,
+          tr.community_id,
+          tr.transaction_id,
+          tr.report_reason_id,
+          tr.reporter_id,
+          rr.reason AS reportName,
+          tr.create_date,
+          u.user_name AS reportStringName
+      FROM
+          tp_transaction_report tr
+      LEFT JOIN sys_report_reason rr ON tr.report_reason_id = rr.id
+      LEFT JOIN ta_user_verify uv on tr.reporter_id = uv.id
+      LEFT JOIN ta_user u on uv.user_id = u.id
     WHERE tr.transaction_id = #{id}
     and tr.community_id = #{communityId,jdbcType=INTEGER}
   </select>