报修进度接口

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java

@@ -16,6 +16,7 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
+import java.util.List;
 
 @RestController
 @RefreshScope
@@ -49,8 +50,16 @@ public class TicketController {
         return response;
     }
     
-    public ResponseBean getTicketSchedule(){
+    @ApiOperation(value = "获取报修详情数据",notes = "获取报修详情数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区编号"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "ticketId",value = "报修id")
+    })
+    @RequestMapping(value = "/ticket/schedule/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getTicketSchedule(@PathVariable(value = "communityId") String communityId,@RequestParam Integer ticketId){
         ResponseBean responseBean = new ResponseBean();
+        TpTicket ticket = iTicketService.getTicketSchedule(communityId,ticketId);
+        responseBean.addSuccess(ticket);
         return responseBean;
     }
     

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

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpTicket;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -26,4 +27,12 @@ public interface TpTicketMapper {
      * @return
      */
     List<TpTicket> selectByCommuniytIdAndByTaUserIdAndByType(Map map);
+    
+    /**
+     * 获取报修进度
+     * @param communityId
+     * @param ticketId
+     * @return
+     */
+	TpTicket selectByTicketId(@Param("communityId") String communityId,@Param("ticketId") Integer ticketId);
 }

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

@@ -1,5 +1,6 @@
 package com.community.huiju.dao;
 
+import com.community.huiju.model.TpTicketRecord;
 import com.community.huiju.model.TpTicketRecordComment;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -30,4 +31,11 @@ public interface TpTicketRecordCommentMapper {
      * @return
      */
     List<TpTicketRecordComment> selectByTicketId(Map map);
+    
+    /**
+     * 查询出这个处理撞他下所有的回复数据
+     * @param tpTicketRecord
+     * @return
+     */
+	List<TpTicketRecordComment> selectByTicketRecordId(TpTicketRecord tpTicketRecord);
 }

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

@@ -2,6 +2,9 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpTicketRecord;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface TpTicketRecordMapper {
@@ -16,4 +19,6 @@ public interface TpTicketRecordMapper {
     int updateByPrimaryKeySelective(TpTicketRecord record);
 
     int updateByPrimaryKey(TpTicketRecord record);
+	
+	List<TpTicketRecord> getTicketRecordByTicketId(@Param("communityId") String communityId,@Param("ticketId") Integer ticketId);
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpTicket {
     private Integer id;
@@ -18,6 +19,11 @@ public class TpTicket {
     private String type;
 
     private String repairType;
+    
+    /**
+     * 报修类型的名字
+     */
+    private String repairName;
 
     private Integer tpUserId;
 
@@ -32,6 +38,8 @@ public class TpTicket {
     private Integer updateUser;
 
     private Date updateDate;
+    
+    private List<TpTicketRecord> ticketRecordList;
 
     public Integer getId() {
         return id;
@@ -152,4 +160,20 @@ public class TpTicket {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+    
+    public String getRepairName() {
+        return repairName;
+    }
+    
+    public void setRepairName(String repairName) {
+        this.repairName = repairName;
+    }
+    
+    public List<TpTicketRecord> getTicketRecordList() {
+        return ticketRecordList;
+    }
+    
+    public void setTicketRecordList(List<TpTicketRecord> ticketRecordList) {
+        this.ticketRecordList = ticketRecordList;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpTicketRecord {
     private Integer id;
@@ -10,10 +11,14 @@ public class TpTicketRecord {
     private Integer ticketId;
 
     private String status;
+    
+    private String ticketStatusName;
 
     private Integer createUser;
 
     private Date createDate;
+    
+    private List<TpTicketRecordComment> ticketRecordCommentList;
 
     public Integer getId() {
         return id;
@@ -62,4 +67,20 @@ public class TpTicketRecord {
     public void setCreateDate(Date createDate) {
         this.createDate = createDate;
     }
+    
+    public String getTicketStatusName() {
+        return ticketStatusName;
+    }
+    
+    public void setTicketStatusName(String ticketStatusName) {
+        this.ticketStatusName = ticketStatusName;
+    }
+    
+    public List<TpTicketRecordComment> getTicketRecordCommentList() {
+        return ticketRecordCommentList;
+    }
+    
+    public void setTicketRecordCommentList(List<TpTicketRecordComment> ticketRecordCommentList) {
+        this.ticketRecordCommentList = ticketRecordCommentList;
+    }
 }

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

@@ -7,7 +7,7 @@ public class TpTicketRecordComment {
 
     private Integer communityId;
 
-    private Integer tickerId;
+    private Integer ticketId;
 
     private Integer ticketRecordId;
 
@@ -38,15 +38,15 @@ public class TpTicketRecordComment {
     public void setCommunityId(Integer communityId) {
         this.communityId = communityId;
     }
-
-    public Integer getTickerId() {
-        return tickerId;
+    
+    public Integer getTicketId() {
+        return ticketId;
     }
-
-    public void setTickerId(Integer tickerId) {
-        this.tickerId = tickerId;
+    
+    public void setTicketId(Integer ticketId) {
+        this.ticketId = ticketId;
     }
-
+    
     public Integer getTicketRecordId() {
         return ticketRecordId;
     }

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

@@ -29,6 +29,12 @@ public interface ITicketService {
      * @return 返回 维修/投诉/联系单 记录列表
      */
     ResponseBean getByTypeList(TpTicket tpTicket,Integer pageNum, Integer pageSize);
-
-
+	
+	/**
+	 * 获取报修详情
+	 * @param communityId
+	 * @param ticketId
+	 * @return
+	 */
+	TpTicket getTicketSchedule(String communityId, Integer ticketId);
 }

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

@@ -3,7 +3,9 @@ package com.community.huiju.service.impl;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.dao.TpTicketMapper;
 import com.community.huiju.dao.TpTicketRecordCommentMapper;
+import com.community.huiju.dao.TpTicketRecordMapper;
 import com.community.huiju.model.TpTicket;
+import com.community.huiju.model.TpTicketRecord;
 import com.community.huiju.model.TpTicketRecordComment;
 import com.community.huiju.service.ITicketService;
 import com.community.huiju.vo.TpTicketVO;
@@ -28,6 +30,9 @@ public class TicketServiceImpl implements ITicketService {
 
     @Autowired
     private TpTicketMapper tpTicketMapper;
+    
+    @Autowired
+    private TpTicketRecordMapper tpTicketRecordMapper;
 
     @Autowired
     private TpTicketRecordCommentMapper tpTicketRecordCommentMapper;
@@ -137,4 +142,25 @@ public class TicketServiceImpl implements ITicketService {
 
         return response;
     }
+    
+    /**
+     * 获取报修详情
+     * @param communityId
+     * @param ticketId
+     * @return
+     */
+    @Override
+    public TpTicket getTicketSchedule(String communityId, Integer ticketId) {
+        //查看工单详情
+        TpTicket ticket = tpTicketMapper.selectByTicketId(communityId,ticketId);
+        //工单进度
+        List<TpTicketRecord> ticketRecordList = tpTicketRecordMapper.getTicketRecordByTicketId(communityId,ticketId);
+        //工单回复
+        ticketRecordList.stream().forEach(TpTicketRecord -> {
+            List<TpTicketRecordComment> ticketRecordCommentList = tpTicketRecordCommentMapper.selectByTicketRecordId(TpTicketRecord);
+            TpTicketRecord.setTicketRecordCommentList(ticketRecordCommentList);
+         });
+        ticket.setTicketRecordList(ticketRecordList);
+        return ticket;
+    }
 }

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

@@ -10,6 +10,7 @@
     <result column="status" property="status" jdbcType="CHAR" />
     <result column="type" property="type" jdbcType="CHAR" />
     <result column="repair_type" property="repairType" jdbcType="CHAR" />
+    <result column="repair_name" property="repairName" jdbcType="VARCHAR" />
     <result column="tp_user_id" property="tpUserId" jdbcType="INTEGER" />
     <result column="score" property="score" jdbcType="VARCHAR" />
     <result column="comment" property="comment" jdbcType="VARCHAR" />
@@ -224,4 +225,26 @@
         </if>
       </trim>
   </select>
+
+  <select id="selectByTicketId" resultMap="BaseResultMap" >
+     SELECT
+        t.id,
+        t.community_id,
+        t.ticket_title,
+        t.ticket_content,
+        t.STATUS,
+        t.type,
+        t.repair_type,
+        d.name as repair_name,
+        t.score,
+        t.COMMENT,
+        t.create_date
+    FROM
+        tp_ticket t
+        LEFT JOIN sys_dictionary d ON t.repair_type = d.CODE
+        AND d.group_id = ( SELECT id FROM sys_dictionary WHERE CODE = "ticket_repair_type" )
+    WHERE
+        t.id = #{ticketId,jdbcType=INTEGER}
+        AND t.community_id = #{communityId,jdbcType=INTEGER}
+  </select>
 </mapper>

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

@@ -4,7 +4,7 @@
   <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTicketRecordComment" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
-    <result column="ticker_id" property="tickerId" jdbcType="INTEGER" />
+    <result column="ticket_id" property="ticketId" jdbcType="INTEGER" />
     <result column="ticket_record_id" property="ticketRecordId" jdbcType="INTEGER" />
     <result column="uuid" property="uuid" jdbcType="INTEGER" />
     <result column="user_type" property="userType" jdbcType="CHAR" />
@@ -14,7 +14,7 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, ticker_id, ticket_record_id, uuid, user_type, content, parent_id, 
+    id, community_id, ticket_id, ticket_record_id, uuid, user_type, content, parent_id,
     user_name, create_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -28,11 +28,11 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpTicketRecordComment" >
-    insert into tp_ticket_record_comment (id, community_id, ticker_id, 
+    insert into tp_ticket_record_comment (id, community_id, ticket_id,
       ticket_record_id, uuid, user_type, 
       content, parent_id, user_name, 
       create_date)
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{tickerId,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{ticketId,jdbcType=INTEGER},
       #{ticketRecordId,jdbcType=INTEGER}, #{uuid,jdbcType=INTEGER}, #{userType,jdbcType=CHAR}, 
       #{content,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, 
       #{createDate,jdbcType=TIMESTAMP})
@@ -46,8 +46,8 @@
       <if test="communityId != null" >
         community_id,
       </if>
-      <if test="tickerId != null" >
-        ticker_id,
+      <if test="ticketId != null" >
+        ticket_id,
       </if>
       <if test="ticketRecordId != null" >
         ticket_record_id,
@@ -78,8 +78,8 @@
       <if test="communityId != null" >
         #{communityId,jdbcType=INTEGER},
       </if>
-      <if test="tickerId != null" >
-        #{tickerId,jdbcType=INTEGER},
+      <if test="ticketId != null" >
+        #{ticketId,jdbcType=INTEGER},
       </if>
       <if test="ticketRecordId != null" >
         #{ticketRecordId,jdbcType=INTEGER},
@@ -110,8 +110,8 @@
       <if test="communityId != null" >
         community_id = #{communityId,jdbcType=INTEGER},
       </if>
-      <if test="tickerId != null" >
-        ticker_id = #{tickerId,jdbcType=INTEGER},
+      <if test="ticketId != null" >
+        ticket_id = #{ticketId,jdbcType=INTEGER},
       </if>
       <if test="ticketRecordId != null" >
         ticket_record_id = #{ticketRecordId,jdbcType=INTEGER},
@@ -140,7 +140,7 @@
   <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpTicketRecordComment" >
     update tp_ticket_record_comment
     set community_id = #{communityId,jdbcType=INTEGER},
-      ticker_id = #{tickerId,jdbcType=INTEGER},
+      ticket_id = #{ticketId,jdbcType=INTEGER},
       ticket_record_id = #{ticketRecordId,jdbcType=INTEGER},
       uuid = #{uuid,jdbcType=INTEGER},
       user_type = #{userType,jdbcType=CHAR},
@@ -155,6 +155,17 @@
     select ttrc.* from tp_ticket tp
                 inner join tp_ticket_record ttr on tp.id = ttr.ticket_id
                 inner join tp_ticket_record_comment ttrc on ttr.ticket_id = ttrc.ticket_record_id
-    where tp.id=#{tickerId,jdbcType=INTEGER} order by ttrc.create_date DESC LIMIT #{size,jdbcType=INTEGER}
+    where tp.id=#{ticketId,jdbcType=INTEGER} order by ttrc.create_date DESC LIMIT #{size,jdbcType=INTEGER}
+  </select>
+
+  <select id="selectByTicketRecordId" parameterType="com.community.huiju.model.TpTicketRecord" resultMap="BaseResultMap" >
+    SELECT
+    <include refid="Base_Column_List" />
+    FROM
+        tp_ticket_record_comment
+    WHERE
+        community_id = #{communityId,jdbcType=INTEGER}
+        AND ticket_id = #{ticketId,jdbcType=INTEGER}
+        AND ticket_record_id = #{id,jdbcType=INTEGER}
   </select>
 </mapper>

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

@@ -103,4 +103,19 @@
       create_date = #{createDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="getTicketRecordByTicketId" resultType="com.community.huiju.model.TpTicketRecord">
+    SELECT
+        t.id,
+        t.ticket_id AS ticketId,
+        t.community_id AS communityId,
+        d.NAME AS ticketStatusName
+    FROM
+        tp_ticket_record t
+        LEFT JOIN sys_dictionary d ON t.STATUS = d.CODE
+        AND d.group_id = ( SELECT id FROM sys_dictionary WHERE CODE = "ticket_status" )
+    WHERE
+        community_id = #{communityId,jdbcType=INTEGER}
+        AND ticket_id = #{ticketId,jdbcType=INTEGER}
+  </select>
 </mapper>