首页调整

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

@@ -38,6 +38,16 @@ public class TpMessage {
     private Integer updateUser;
 
     private Date updateDate;
+    
+    /**
+     * 工单状态
+     */
+    private String ticketStatus;
+    
+    /**
+     * 工单扭转自动添加的内容
+     */
+    private String content;
 
     public Integer getId() {
         return id;
@@ -182,4 +192,20 @@ public class TpMessage {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+    
+    public String getTicketStatus() {
+        return ticketStatus;
+    }
+    
+    public void setTicketStatus(String ticketStatus) {
+        this.ticketStatus = ticketStatus;
+    }
+    
+    public String getContent() {
+        return content;
+    }
+    
+    public void setContent(String content) {
+        this.content = content;
+    }
 }

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

@@ -20,6 +20,8 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="ticket_status" property="ticketStatus" jdbcType="VARCHAR" />
+    <result column="content" property="content" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, ticket_id,community_id, message_type, advice_type, model_type, uuid, uuid_type, source,
@@ -260,18 +262,41 @@
 
   <select id="getMessages" resultMap="BaseResultMap">
     SELECT
-      <include refid="Base_Column_List" />
+        t.id,
+        t.ticket_id,
+        t.community_id,
+        t.message_type,
+        t.advice_type,
+        t.model_type,
+        t.uuid,
+        t.uuid_type,
+        t.source,
+        t.message_content,
+        t.STATUS,
+        t.result,
+        t.meaasge_type_id,
+        t.read_status,
+        t.create_user,
+        t.create_date,
+        t.update_user,
+        t.update_date,
+        k.status,
+        r.content,
+        d.name as ticket_status
     FROM
-        tp_message
+        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" )
     WHERE
-        uuid_type = 1
-        AND community_id = #{communityId,jdbcType=INTEGER}
-        AND uuid = #{userId,jdbcType=INTEGER}
-        AND STATUS = 1
-        AND advice_type = 1
-        AND model_type = #{modelType,jdbcType=INTEGER}
+        t.uuid_type = 1
+        AND t.community_id = #{communityId,jdbcType=INTEGER}
+        AND t.uuid = #{userId,jdbcType=INTEGER}
+        AND t.STATUS = 1
+        AND t.advice_type = 1
+        AND t.model_type = #{modelType,jdbcType=INTEGER}
     ORDER BY
-    create_date DESC
+    t.create_date DESC
   </select>
 
   <update id="updateReadStatus" parameterType="java.lang.Integer" >