合并

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

@@ -120,6 +120,20 @@ public class TpTransaction {
      */
     private List<TpTransactionReport> TpTransactionReport;
 
+    /**
+     * 判断前端举报标记是否展示
+     * @return
+     */
+    private  Integer reportButton;
+
+    public Integer getReportButton() {
+        return reportButton;
+    }
+
+    public void setReportButton(Integer reportButton) {
+        this.reportButton = reportButton;
+    }
+
     public List<com.community.huiju.model.TpTransactionReport> getTpTransactionReport() {
         return TpTransactionReport;
     }

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

@@ -25,14 +25,14 @@ public class TpTransactionReport {
      * 举报人姓名
      * @return
      */
-    private String reportStringName;
+    private String reportUserName;
 
-    public String getReportStringName() {
-        return reportStringName;
+    public String getReportUserName() {
+        return reportUserName;
     }
 
-    public void setReportStringName(String reportStringName) {
-        this.reportStringName = reportStringName;
+    public void setReportUserName(String reportUserName) {
+        this.reportUserName = reportUserName;
     }
 
     public String getReportName() {

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

@@ -638,11 +638,10 @@ public class SocialServiceImpl implements SocialServiceI {
                 tdImagesMapper.insert(tdImages);
             }
         }
-        // 推消息
-        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);
+        // 推消
+        TpMessage  tpMessage = new TpMessage(null,userElement.getCommunityId(),"6","1","1", tpTransactionReply.getUuid(),"1","2",  userElement.getUserName()+":"+tpTransactionReply.getReplyContent(),
+                                          "1",null,null,"0",userElement.getUserVerifyId(),new Date(),null,null,null,null,null,tpTransactionReply.getTransactionId());
+        tpMessageMapper.insertSelective(tpMessage);
         response.addSuccess("成功");
         return response;
     }
@@ -1038,6 +1037,11 @@ public class SocialServiceImpl implements SocialServiceI {
         List<TpTransaction> tpTransactionManageList= tpTransactionMapper.tpTransactionManageList(tpUser.getCommunityId(),status,transactionTitle);
 
         for (TpTransaction tpTransaction:tpTransactionManageList){
+            // 判断前台举报按钮是否展示
+            int isReported = Integer.parseInt(tpTransaction.getIsReported()); int isStatus = status.intValue();
+            if (1 == isReported && 1 == isStatus){
+                tpTransaction.setReportButton(1);
+            }
             // 统计举报整数
             int transactionReplyCount= tpTransactionReportMapper.selectCount(tpTransaction.getId(),tpTransaction.getCommunityId());
             tpTransaction.setTransactionReplyCount(transactionReplyCount);

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

@@ -52,14 +52,14 @@
       uuid_type, source, message_content,
       status, result, meaasge_type_id,
       read_status, create_user, create_date,
-      update_user, update_date, bill_id, activity_id, announcement_id)
+      update_user, update_date, bill_id, activity_id, announcement_id,transaction_id)
     values (#{id,jdbcType=INTEGER}, #{ticketId,jdbcType=INTEGER},#{communityId,jdbcType=INTEGER}, #{messageType,jdbcType=CHAR},
       #{adviceType,jdbcType=CHAR}, #{modelType,jdbcType=CHAR}, #{uuid,jdbcType=INTEGER},
       #{uuidType,jdbcType=CHAR}, #{source,jdbcType=CHAR}, #{messageContent,jdbcType=VARCHAR},
       #{status,jdbcType=CHAR}, #{result,jdbcType=VARCHAR}, #{meaasgeTypeId,jdbcType=VARCHAR},
       #{readStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP},
       #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, #{billId,jdbcType=INTEGER},
-      #{activityId,jdbcType=INTEGER}, #{announcementId,jdbcType=INTEGER})
+      #{activityId,jdbcType=INTEGER}, #{announcementId,jdbcType=INTEGER},#{transactionId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpMessage" useGeneratedKeys="true" keyProperty="id" >
     insert into tp_message

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

@@ -22,11 +22,12 @@
         <result column="role_name" property="roleName" jdbcType="VARCHAR"/>
         <result column="release_identity" property="releaseIdentity" jdbcType="VARCHAR"/>
         <result column="room_no_name" property="roomNoName" jdbcType="VARCHAR"/>
+        <result column="is_reported" property="isReported" jdbcType="VARCHAR"/>
 
     </resultMap>
     <sql id="Base_Column_List">
     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,read_status
+    view_count, status, type, create_user, create_date, update_user, update_date, release_identity,room_no_name,read_status,is_reported
   </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpTransaction">
     select

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

@@ -9,7 +9,7 @@
     <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" />
+    <result column="reportStringName" property="reportUserName" jdbcType="VARCHAR" />
 
   </resultMap>
   <sql id="Base_Column_List" >
@@ -120,7 +120,7 @@
           tr.reporter_id,
           rr.reason AS reportName,
           tr.create_date,
-          u.user_name AS reportStringName
+          u.user_name AS reportUserName
       FROM
           tp_transaction_report tr
       LEFT JOIN sys_report_reason rr ON tr.report_reason_id = rr.id