修改 工单部分逻辑

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

@@ -10,6 +10,11 @@ public class TpTicketRecord {
 
     private Integer ticketId;
 
+    /**
+     * 自动生成的回复
+     */
+    private String content;
+
     private String status;
     
     private String ticketStatusName;
@@ -44,6 +49,14 @@ public class TpTicketRecord {
         this.ticketId = ticketId;
     }
 
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
     public String getStatus() {
         return status;
     }

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

@@ -212,16 +212,23 @@ public class TicketServiceImpl implements ITicketService {
 
         TpTicket tpTicket = JSONObject.parseObject(parameter,TpTicket.class);
 
+        /**
+         * 工单表 -> 工单处理表 -> 消息表
+         * 依次插入相关数据, 该工单默认的第一条数据(待分配), 是工单标题,
+          */
+
+
         TaUser user = taUserMapper.selectByPrimaryKey(userId);
 
         tpTicket.setCommunityId(user.getCommunityId());
         tpTicket.setTaUserId(userId);
-        tpTicket.setStatus("2");
+        // 默认待分配
+        tpTicket.setStatus("0");
         tpTicket.setCreateUser(userId);
         tpTicket.setCreateDate(new Date());
         tpTicket.setUpdateUser(userId);
         tpTicket.setUpdateDate(new Date());
-
+        // 插入工单
         tpTicketMapper.insertSelective(tpTicket);
         insertTdImage(tpTicket, imageUrl, userId);
 
@@ -231,12 +238,17 @@ public class TicketServiceImpl implements ITicketService {
         TpTicket tpTicketReco = tpTicketMapper.selectByPrimaryKey(id);
         tpTicketRecord.setCommunityId(user.getCommunityId());
         tpTicketRecord.setTicketId(tpTicketReco.getId());
+        // 0 代表 报修  1 代表 投诉  2代表 联系单
+        String typeName = "0".equals(tpTicket.getType())?"报修":"1".equals(tpTicket.getType())?"投诉":"2".equals(tpTicket.getType())?"联系工单":"";
+        tpTicketRecord.setContent("您的"+ typeName +"正在分配物业处理人员, 若长时间无人处理, 请联系物业!");
         tpTicketRecord.setStatus(tpTicketReco.getStatus());
         tpTicketRecord.setCreateUser(userId);
         tpTicketRecord.setCreateDate(new Date());
-
+        // 插入工单处理表
         tpTicketRecordMapper.insertSelective(tpTicketRecord);
 
+
+
         // 把工单信息添加到消息表
         insertTicketMessage(tpTicket,userId);
 

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

@@ -5,12 +5,13 @@
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
     <result column="ticket_id" property="ticketId" jdbcType="INTEGER" />
+    <result column="content" property="content" jdbcType="VARCHAR" />
     <result column="status" property="status" jdbcType="CHAR" />
     <result column="create_user" property="createUser" jdbcType="INTEGER" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, ticket_id, status, create_user, create_date
+    id, community_id, ticket_id, content, status, create_user, create_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -23,11 +24,11 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpTicketRecord" >
-    insert into tp_ticket_record (id, community_id, ticket_id, 
+    insert into tp_ticket_record (id, community_id, ticket_id, content,
       status, create_user, create_date
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{ticketId,jdbcType=INTEGER}, 
-      #{status,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}
+      #{content,jdbcType=VARCHAR}, #{status,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpTicketRecord" >
@@ -42,6 +43,9 @@
       <if test="ticketId != null" >
         ticket_id,
       </if>
+      <if test="content != null">
+        content,
+      </if>
       <if test="status != null" >
         status,
       </if>
@@ -62,6 +66,9 @@
       <if test="ticketId != null" >
         #{ticketId,jdbcType=INTEGER},
       </if>
+      <if test="content != null">
+        #{content,jdbcType=VARCHAR},
+      </if>
       <if test="status != null" >
         #{status,jdbcType=CHAR},
       </if>
@@ -82,6 +89,9 @@
       <if test="ticketId != null" >
         ticket_id = #{ticketId,jdbcType=INTEGER},
       </if>
+      <if test="content != null">
+        content = #{content,jdbcType=VARCHAR},
+      </if>
       <if test="status != null" >
         status = #{status,jdbcType=CHAR},
       </if>
@@ -98,6 +108,7 @@
     update tp_ticket_record
     set community_id = #{communityId,jdbcType=INTEGER},
       ticket_id = #{ticketId,jdbcType=INTEGER},
+      content = #{content,jdbcType=VARCHAR},
       status = #{status,jdbcType=CHAR},
       create_user = #{createUser,jdbcType=INTEGER},
       create_date = #{createDate,jdbcType=TIMESTAMP}