合并本地分支

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

@@ -48,6 +48,11 @@ public class TpMessage {
      * 工单扭转自动添加的内容
      */
     private String content;
+    
+    /**
+     * 消息图标
+     */
+    private String messageIcon;
 
     public Integer getId() {
         return id;
@@ -208,4 +213,12 @@ public class TpMessage {
     public void setContent(String content) {
         this.content = content;
     }
+    
+    public String getMessageIcon() {
+        return messageIcon;
+    }
+    
+    public void setMessageIcon(String messageIcon) {
+        this.messageIcon = messageIcon;
+    }
 }

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

@@ -22,6 +22,7 @@
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
     <result column="ticket_status" property="ticketStatus" jdbcType="VARCHAR" />
     <result column="content" property="content" jdbcType="VARCHAR" />
+    <result column="message_icon" property="messageIcon" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, ticket_id,community_id, message_type, advice_type, model_type, uuid, uuid_type, source,
@@ -282,12 +283,14 @@
         t.update_date,
         k.status,
         r.content,
-        d.name as ticket_status
+        d.name as ticket_status,
+        y.name as message_icon
     FROM
         tp_message t
     LEFT JOIN tp_ticket k on t.ticket_id = k.id  AND k.community_id = #{communityId,jdbcType=INTEGER}
     LEFT JOIN tp_ticket_record r on t.ticket_id = r.ticket_id AND r.community_id = #{communityId,jdbcType=INTEGER}  AND k.status = r.status
     LEFT JOIN sys_dictionary d on k.status = d.code AND d.group_id = ( SELECT id FROM sys_dictionary WHERE CODE = "ticket_status" )
+    LEFT JOIN sys_dictionary y on t.message_type = y.code AND y.group_id = ( SELECT id FROM sys_dictionary WHERE CODE = "message_type_img" )
     WHERE
         t.uuid_type = 1
         AND t.community_id = #{communityId,jdbcType=INTEGER}

文档/MYSQL/smartCommunity.pdb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542608557" Name="smartCommunity" Objects="658" Symbols="77" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542682714" Name="smartCommunity" Objects="647" Symbols="77" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -10900,9 +10900,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>message_type</a:Code>
 <a:CreationDate>1539323972</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1541473588</a:ModificationDate>
+<a:ModificationDate>1542682714</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>消息类型  1：投诉   2：报修 3：联系物业  4： 下载类型</a:Comment>
+<a:Comment>消息类型  1：投诉   2：报修 3：联系物业  4： 访客  5:公告  6:系统通知  7:账单</a:Comment>
 <a:DataType>char(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>

文档/MYSQL/smartCommunity.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542608557" Name="smartCommunity" Objects="658" Symbols="77" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542682714" Name="smartCommunity" Objects="647" Symbols="77" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -10900,9 +10900,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>message_type</a:Code>
 <a:CreationDate>1539323972</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1541473588</a:ModificationDate>
+<a:ModificationDate>1542682714</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>消息类型  1：投诉   2：报修 3：联系物业  4： 下载类型</a:Comment>
+<a:Comment>消息类型  1：投诉   2：报修 3：联系物业  4： 访客  5:公告  6:系统通知  7:账单</a:Comment>
 <a:DataType>char(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>