合并

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

@@ -4,6 +4,7 @@ import com.community.huiju.model.TpTransaction;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -31,7 +32,7 @@ public interface TpTransactionMapper {
 	
 	List<Map<String, Object>> getReportReasons();
     
-    int saveReportReason(@Param("userId") Integer userId,@Param("communityId") Integer communityId,@Param("transactionId") Integer transactionId,@Param("reportReasonId") String reportReasonId);
+    int saveReportReason(@Param("userId") Integer userId, @Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId, @Param("reportReasonId") String reportReasonId, @Param("createDate") Date createDate);
 
     /**
      * 查询的当前用户自己的所有帖子

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

@@ -1,5 +1,8 @@
 package com.community.huiju.model;
 
+import javax.xml.crypto.Data;
+import java.util.Date;
+
 public class TpTransactionReport {
     private Integer id;
 
@@ -11,6 +14,16 @@ public class TpTransactionReport {
 
     private Integer reporterId;
 
+    private Date createDate;
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
     public Integer getId() {
         return id;
     }

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

@@ -506,7 +506,7 @@ public class SocialServiceImpl implements SocialServiceI {
             return responseBean;
         }
         //插入举报表
-        tpTransactionMapper.saveReportReason(userId, communityId, transactionId, reportReasonId);
+        tpTransactionMapper.saveReportReason(userId, communityId, transactionId, reportReasonId,new Date());
         //更新交易表的举报状态为被举报
         TpTransaction record = new TpTransaction();
         record.setId(transactionId);

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

@@ -306,9 +306,9 @@
 
     <insert id="saveReportReason">
     insert into tp_transaction_report (community_id, transaction_id,
-      report_reason_id, reporter_id)
+      report_reason_id, reporter_id,create_date)
     values (#{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER},
-      #{reportReasonId,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER})
+      #{reportReasonId,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER},#{createDate,jdbcType=TIMESTAMP})
   </insert>
     <select id="getUserTransactionList" resultMap="BaseResultMap">
 

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

@@ -24,6 +24,7 @@
             AND u.user_name like concat('%',#{reportUserNmae},'%')
         </if>
         </where>
+        GROUP BY tr.id
         order by tr.create_date desc
 </select>
 </mapper>

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

@@ -291,7 +291,7 @@ export default {
         width: 100%;
         overflow: auto;
         word-break: break-all; 
-        margin-left: -14.5%;
+        margin-left: -11.5%;
     }
 </style>