合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java

@@ -44,11 +44,58 @@ public class TpTicketController extends BaseController {
                     "status:流转状态(0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止'）" +
                     "tpUserId:当前处理人" )
     })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/ticketLiset", method = RequestMethod.POST)
-    public ResponseBean addUser(@RequestBody String parameter, HttpSession session){
-//        UserElement userElement = getUserElement(session);
-        ResponseBean  responseBean = tpTicketService.ticketLiset(parameter);
+    public ResponseBean ticketLiset(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = tpTicketService.ticketLiset(parameter,userElement.getCommunityId());
         return responseBean;
     }
 
+    @ApiOperation(value = "工单详情", notes = "工单详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:工单编号")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/ticketDetails", method = RequestMethod.POST)
+    public ResponseBean ticketDetails(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = tpTicketService.ticketDetails(parameter,userElement.getId(),userElement.getCommunityId());
+        return responseBean;
+    }
+    @ApiOperation(value = "添加工单对话", notes = "添加工单对话")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "content:对话内容，imageUrl:[]图片,ticketId:工单id，" +
+                    "status:工单状态（0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止）")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/addRecordComment", method = RequestMethod.POST)
+    public ResponseBean addRecordComment(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = tpTicketService.addRecordComment(parameter,userElement.getId(),userElement.getCommunityId(),userElement.getUserName());
+        return responseBean;
+    }
+    @ApiOperation(value = "工单受理分配", notes = "工单受理分配")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "ticketId:工单id，" +
+                    "status:工单状态（0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止）,currentId:当前分配处理人Id")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/addRecord", method = RequestMethod.POST)
+    public ResponseBean addRecord(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = tpTicketService.addRecord(parameter,userElement.getId(),userElement.getCommunityId());
+        return responseBean;
+    }
+    @ApiOperation(value = "修改工单状态为拒绝处理", notes = "修改工单状态为拒绝处理")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "ticketId:工单id" )
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/updateTicketStatus", method = RequestMethod.POST)
+    public ResponseBean updateTicketStatus(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = tpTicketService.updateTicketStatus(parameter,userElement.getId());
+        return responseBean;
+    }
 }

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

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.community.huiju.model.TpTicket;
+import com.community.huiju.vo.TpTicketVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 工单表 Mapper 接口
@@ -18,5 +21,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TpTicketMapper extends BaseMapper<TpTicket> {
 
-    IPage<TpTicket> ticketList(Page page, @Param("ticket")TpTicket ticket ,@Param("UserNmae") String UserNmae,@Param("updateUserNmae") String updateUserNmae);
+    IPage<TpTicket> ticketList(Page page, @Param("ticket")TpTicket ticket ,@Param("UserNmae") String UserNmae,@Param("updateUserNmae") String updateUserNmae,@Param("communityId") Integer communityId);
+    TpTicketVO ticketDetails(@Param("id") Integer id);
 }

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

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.TpTicketRecord;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +14,11 @@ import com.community.huiju.model.TpTicketRecord;
  */
 public interface TpTicketRecordMapper extends BaseMapper<TpTicketRecord> {
 
+    TpTicketRecord selectTpTicketRecord(@Param("ticketId") Integer ticketId, @Param("status") Integer status);
+
+    /**
+     * 在状态为待分配的情况下根据工单ID修改
+     * @param tpTicketRecord
+     */
+    void updateTicketRecord(TpTicketRecord tpTicketRecord);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/UserMapper.java

@@ -60,4 +60,12 @@ public interface UserMapper extends BaseMapper<User> {
      * @return
      */
     List<Map<String, Object>> selectByPermissionList(@Param("array") List<String> permissionList);
+
+    /**
+     * 获取所有物业人员并排除自身
+     * @param id
+     * @param communityId
+     * @return
+     */
+    List<User> getUser(@Param("id") Integer id, @Param("communityId") Integer communityId);
 }

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

@@ -23,6 +23,8 @@ public class TpTicketRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    private Integer id;
+
     /**
      * 小区id
      */
@@ -53,5 +55,4 @@ public class TpTicketRecord implements Serializable {
      */
     private LocalDateTime createDate;
 
-
 }

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

@@ -1,5 +1,7 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -23,6 +25,9 @@ public class TpTicketRecordComment implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "id", type = IdType.AUTO)
+    private  Integer id;
+
     /**
      * 小区id
      */

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java

@@ -17,7 +17,42 @@ public interface TpTicketService extends IService<TpTicket> {
     /**
      * 工单列表
      * @param parameter
+     * @param communityId
      * @return
      */
-    ResponseBean ticketLiset(String parameter);
+    ResponseBean ticketLiset(String parameter,Integer communityId);
+
+    /**
+     * 工单详情
+     * @param parameter
+     * @return
+     */
+    ResponseBean ticketDetails(String parameter,Integer userID,Integer communityId);
+
+    /**
+     * 添加工单回复
+     * @param parameter
+     * @param id
+     * @param communityId
+     * @param userName
+     * @return
+     */
+    ResponseBean addRecordComment(String parameter, Integer id,Integer communityId,String userName);
+
+    /**
+     * 添加工单分配受理
+     * @param parameter
+     * @param id
+     * @param communityId
+     * @return
+     */
+    ResponseBean addRecord(String parameter, Integer id, Integer communityId);
+
+    /**
+     * 修改工单状态为拒绝处理
+     * @param parameter
+     * @param id
+     * @return
+     */
+    ResponseBean updateTicketStatus(String parameter, Integer id);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java

@@ -1,20 +1,20 @@
 package com.community.huiju.service.impl;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.dao.TpTicketMapper;
-import com.community.huiju.dao.UserMapper;
-import com.community.huiju.model.TpBuildingOwnerInfo;
-import com.community.huiju.model.TpTicket;
-import com.community.huiju.model.User;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.TpTicketService;
 import com.community.huiju.vo.TpTicketVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -36,8 +36,17 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
     @Autowired
     private UserMapper userMapper;
+
+    @Autowired
+    private TdImagesMapper tdImagesMapper;
+
+    @Autowired
+    private TpTicketRecordMapper tpTicketRecordMapper;
+
+    @Autowired
+    private TpTicketRecordCommentMapper tpTicketRecordCommentMapper;
     @Override
-    public ResponseBean ticketLiset(String parameter) {
+    public ResponseBean ticketLiset(String parameter,Integer communityId) {
          ResponseBean response= new ResponseBean<>();
         TpTicket   ticket= JSONObject.parseObject(parameter, TpTicket.class);
 
@@ -50,7 +59,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         Page<TpTicket> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        IPage<TpTicket> pageInfo = tpTicketMapper.ticketList(page,ticket,UserNmae,updateUserNmae);
+        IPage<TpTicket> pageInfo = tpTicketMapper.ticketList(page,ticket,UserNmae,updateUserNmae,communityId);
         List<TpTicket> ticketList = pageInfo.getRecords();
 
         List<TpTicket> tpTicketArrayList= new ArrayList<>();
@@ -75,4 +84,147 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         response.addSuccess(map);
         return response;
     }
+
+    @Override
+    public ResponseBean ticketDetails(String parameter,Integer userID,Integer communityId) {
+         ResponseBean response= new ResponseBean();
+        JSONObject object= JSONObject.parseObject(parameter);
+        Integer ticketId = object.getInteger("id");
+        TpTicketVO ticketVO= tpTicketMapper.ticketDetails(ticketId);
+        /*查询当前工单创建人（发起人）*/
+        ticketVO.setCreateUserNmae(userMapper.selectByIdUserName(ticketVO.getCreateUser()));
+        /*发起人手机号码*/
+        ticketVO.setLoginName(userMapper.selectById(ticketVO.getCreateUser()).getLoginName());
+          /*查询当前受理人*/
+        ticketVO.setTpUserNmae(userMapper.selectByIdUserName(ticketVO.getTpUserId()));
+        /*所有物业端本小区的人员*/
+        ticketVO.setUserList(userMapper.getUser( userID,communityId));
+        /*本人*/
+        ticketVO.setCurrentUserName(userID);
+
+
+        /*查询工单类容的图片*/
+        QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(TdImages::getUuid,ticketId);
+        queryWrapper.lambda().eq(TdImages::getType,ticketVO.getType());
+        List<TdImages> tdImages= tdImagesMapper.selectList(queryWrapper);
+        List<String> contentImg = new ArrayList<String>();
+        for (TdImages images:tdImages){
+            contentImg.add(images.getImageUrl());
+        }
+        ticketVO.setContentImageUrl(contentImg);
+
+        /*查询沟通的记录*/
+        QueryWrapper<TpTicketRecord> RecordWrapper = new QueryWrapper<>();
+        RecordWrapper.lambda().eq(TpTicketRecord::getTicketId,ticketId);
+        List<TpTicketRecord> ticketRecordList= tpTicketRecordMapper.selectList(RecordWrapper);
+        ticketVO.setRecordList(ticketRecordList);
+
+        /*对话详情*/
+        QueryWrapper<TpTicketRecordComment> RecordCommentWrapper = new QueryWrapper<>();
+        RecordCommentWrapper.lambda().eq(TpTicketRecordComment::getTicketId,ticketId);
+        List<TpTicketRecordComment> tpTicketRecordCommentList= tpTicketRecordCommentMapper.selectList(RecordCommentWrapper);
+        /*设置所有的对话*/
+        ticketVO.setTpTicketRecordCommentList(tpTicketRecordCommentList);
+        /*获取对话的图片*/
+        for (TpTicketRecordComment tpTicketRecordComment :tpTicketRecordCommentList){
+            QueryWrapper<TdImages> RecordCommentImg = new QueryWrapper<>();
+            RecordCommentImg.lambda().eq(TdImages::getUuid,tpTicketRecordComment.getId());
+            /*注意reply用于标记工单回复类的图片*/
+            RecordCommentImg.lambda().eq(TdImages::getType,"reply");
+            RecordCommentImg.lambda().eq(TdImages::getType,ticketVO.getType());
+            List<TdImages> ticketRecordCommentImages= tdImagesMapper.selectList(queryWrapper);
+            List<String> ticketRecordCommentImg = new ArrayList<String>();
+            for (TdImages images:ticketRecordCommentImages){
+                ticketRecordCommentImg.add(images.getImageUrl());
+            }
+            ticketVO.setTicketRecordCommentImagesUrl(contentImg);
+        }
+        response.addSuccess(ticketVO);
+        return response;
+    }
+
+    @Override
+    public ResponseBean addRecordComment(String parameter, Integer id,Integer communityId,String userName) {
+        ResponseBean response=new ResponseBean();
+        JSONObject object= JSONObject.parseObject(parameter);
+
+        String  content = object.getString("content");
+        Integer  ticketId = object.getInteger("ticketId");
+        Integer  status = object.getInteger("status");
+
+        /*根据工单Id和状态查出工单记录ID*/
+        TpTicketRecord ticketRecord= tpTicketRecordMapper.selectTpTicketRecord(ticketId,status);
+
+        TpTicketRecordComment tpTicketRecordComment= new TpTicketRecordComment();
+        tpTicketRecordComment.setCommunityId(communityId);
+        tpTicketRecordComment.setContent(content);
+        tpTicketRecordComment.setTicketId(ticketId);
+        tpTicketRecordComment.setTicketRecordId(ticketRecord.getId());
+        tpTicketRecordComment.setUuid(id);
+        tpTicketRecordComment.setUserType("0");
+        tpTicketRecordComment.setUserName(userName);
+        tpTicketRecordComment.setCreateDate(LocalDateTime.now());
+        tpTicketRecordCommentMapper.insert(tpTicketRecordComment);
+
+        JSONArray contentImg = object.getJSONArray("imageUrl");
+        String[] contentImgArray = contentImg.toArray(new String[]{});
+
+        for (String img : contentImgArray) {
+            TdImages tdImages = new TdImages();
+            tdImages.setImageUrl(img);
+             /*注意reply用于标记工单回复类的图片*/
+            tdImages.setType("reply");
+            tdImages.setUuid(tpTicketRecordComment.getId());
+            tdImages.setCreateTime(LocalDateTime.now());
+            tdImages.setCreateUser(id);
+            tdImagesMapper.insert(tdImages);
+        }
+        response.addSuccess("成功");
+        return response;
+    }
+
+    @Override
+    public ResponseBean addRecord(String parameter, Integer id, Integer communityId) {
+        ResponseBean response=new ResponseBean();
+
+        JSONObject object= JSONObject.parseObject(parameter);
+        Integer  ticketId = object.getInteger("ticketId");
+        String  status = object.getString("status");
+        String  currentId = object.getString("currentId");
+
+        User userName= userMapper.selectById(currentId);
+
+        TpTicketRecord tpTicketRecord= new TpTicketRecord();
+        tpTicketRecord.setCommunityId(communityId);
+        tpTicketRecord.setTicketId(ticketId);
+        tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + userName.getUserName()+",联系方式:" + userName.getLoginName());
+        tpTicketRecord.setStatus(status);
+        tpTicketRecord.setCreateUser(id);
+        tpTicketRecord.setCreateDate(LocalDateTime.now());
+        tpTicketRecordMapper.insert(tpTicketRecord);
+        response.addSuccess("成功");
+        return response;
+    }
+
+    @Override
+    public ResponseBean updateTicketStatus(String parameter, Integer id) {
+        /*拒绝处理仅在待分配的情况下修改，由前台控制拒绝处理的按钮是否显示*/
+        ResponseBean response=  new ResponseBean();
+        JSONObject object= JSONObject.parseObject(parameter);
+        Integer  ticketId = object.getInteger("ticketId");
+        TpTicket tpTicket= new TpTicket();
+        tpTicket.setId(ticketId);
+        tpTicket.setStatus("1");
+        tpTicket.setUpdateUser(id);
+        tpTicket.setUpdateDate(LocalDateTime.now());
+        tpTicketMapper.updateById(tpTicket);
+
+        TpTicketRecord tpTicketRecord= new TpTicketRecord();
+        tpTicketRecord.setTicketId(ticketId);
+        tpTicketRecord.setStatus("1");
+        tpTicketRecordMapper.updateTicketRecord(tpTicketRecord);
+        response.addSuccess("成功");
+        return response;
+    }
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/vo/TpTicketVO.java

@@ -1,8 +1,14 @@
 package com.community.huiju.vo;
 
 import com.community.huiju.model.TpTicket;
+import com.community.huiju.model.TpTicketRecord;
+import com.community.huiju.model.TpTicketRecordComment;
+import com.community.huiju.model.User;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * version V1.0
  * class_name: $METHOD_NAME$
@@ -23,4 +29,38 @@ public class TpTicketVO extends TpTicket {
      */
     private String tpUserNmae;
 
+    /**
+     *工单内容下的图片
+     */
+    private  List<String> contentImageUrl;
+
+    /**
+     * 工单流程状态
+     */
+    private List<TpTicketRecord> recordList;
+
+    /**
+     * 工单对话图片
+     */
+    private  List<String> ticketRecordCommentImagesUrl;
+
+    /**
+     * 工单对话记录
+     */
+    private List<TpTicketRecordComment> tpTicketRecordCommentList;
+
+    /**
+     * 发起人手机号码
+     */
+    private  String loginName;
+
+    /**
+     * 所有当前小区的物业人员
+     */
+    private List<User> userList;
+
+    /**
+     * 当前人
+     */
+    private Integer CurrentUserName;
 }

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

@@ -21,7 +21,8 @@
     us.user_name
     FROM
     tp_ticket p
-    LEFT JOIN tp_user AS us on p.create_user=us.id
+    LEFT JOIN tp_user AS us ON p.create_user=us.id
+    LEFT JOIN tp_user AS u ON p.tp_user_id = u.id
 <where>
     <if test="ticket.id != null and ticket.id !=''">
         and  p.id=#{ticket.id,jdbcType=INTEGER}
@@ -39,11 +40,32 @@
         and  p.status=#{ticket.status,jdbcType=INTEGER}
     </if>
     <if test="updateUserNmae != null and updateUserNmae !=''">
-        and  p.user_name=#{updateUserNmae,jdbcType=INTEGER}
+        and u.user_name like concat('%',#{ updateUserNmae,jdbcType=VARCHAR},'%')
     </if>
+    and p.community_id=#{communityId,jdbcType=INTEGER}
 </where>
         order by  create_date desc
-
     </select>
 
+    <select id="ticketDetails" resultType="com.community.huiju.vo.TpTicketVO">
+        SELECT
+        p.id,
+        p.community_id,
+        p.ta_user_id,
+        p.ticket_title,
+        p.ticket_content,
+        p.STATUS,
+        p.type,
+        p.repair_type,
+        p.tp_user_id,
+        p.score,
+        p.COMMENT,
+        p.create_user,
+        p.create_date,
+        p.update_user,
+        p.update_date
+        FROM
+        tp_ticket p
+        WHERE p.id=#{id,jdbcType=INTEGER}
+    </select>
 </mapper>

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

@@ -1,5 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.community.huiju.tp.mapper.TpTicketRecordMapper">
-
+<mapper namespace="com.community.huiju.dao.TpTicketRecordMapper">
+<select id="selectTpTicketRecord" resultType="com.community.huiju.model.TpTicketRecord">
+    SELECT
+    id, community_id, ticket_id, content, status, create_user, create_date
+    FROM tp_ticket_record
+    WHERE ticket_id = #{ticketId,jdbcType=INTEGER}
+          and status = #{status,jdbcType=INTEGER}
+</select>
+    <update id="updateTicketRecord" parameterType="com.community.huiju.model.TpTicketRecord" >
+        update tp_ticket_record
+        <set >
+            <if test="communityId != null" >
+                community_id = #{communityId,jdbcType=INTEGER},
+            </if>
+            <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>
+            <if test="createUser != null" >
+                create_user = #{createUser,jdbcType=INTEGER},
+            </if>
+            <if test="createDate != null" >
+                create_date = #{createDate,jdbcType=TIMESTAMP},
+            </if>
+        </set>
+        where ticket_id = #{ticketId,jdbcType=INTEGER}
+    </update>
 </mapper>

CODE/smart-community/property-api/src/main/resources/mapper/UserMapper.xml

@@ -127,4 +127,20 @@
         </foreach>
         )
     </select>
+
+    <select id="getUser" resultType="com.community.huiju.model.User">
+        SELECT
+        tu.create_user,
+        tu.create_date,
+        tu.update_date,
+        tu.user_name,
+        tu.remark,
+        tu.login_name,
+        tu.status,
+        tu.id
+        FROM
+         tp_user tu
+        WHERE   tu.community_id=#{communityId,jdbcType=INTEGER}
+        and tu.id!=#{id,jdbcType=INTEGER}
+    </select>
 </mapper>

VUECODE/smart-property-manage/src/api/ticket.js

@@ -12,7 +12,9 @@ export function listTicket(data) {
       createUser: data.createUser,
       status: data.status,
       tpUserId: data.tpUserId,
-      updateUserNmae: data.updateUserNmae
+      updateUserNmae: data.updateUserNmae,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
     }
   })
 }

VUECODE/smart-property-manage/src/views/ticket/index.vue

@@ -31,7 +31,7 @@
         </el-select>
       </el-form-item>
       <el-form-item class="filter-item" label="处理人">
-        <el-input v-model.trim="listQuery.tpUserNmae" placeholder="处理人" />
+        <el-input v-model.trim="listQuery.updateUserNmae" placeholder="处理人" />
       </el-form-item>       
       <el-form-item>
         <el-button type="info" class="filter-item" @click="handleFilter">清空</el-button>
@@ -46,9 +46,6 @@
       tooltip-effect="dark"
       style="width: 100%; margin-top: 20px;"
       @selection-change="handleSelectionChange">
-      <el-table-column
-        type="selection"
-        width="55"/>
       <el-table-column prop="id" label="编号" align="center"/>
       <el-table-column prop="type" label="类型" align="center">
         <template slot-scope="scope">
@@ -60,7 +57,7 @@
       <el-table-column prop="ticketTitle" label="标题" align="center">
       <template slot-scope="scope">
         <a :title="scope.row.ticketTitle">
-          <span style="color: #8B8378	">
+          <span style="color: #009FCC	">
            {{ scope.row.ticketTitle.length>='15'?scope.row.ticketTitle.substring(0,15)+'..':scope.row.ticketTitle }}
           </span>
         </a>
@@ -79,7 +76,7 @@
           <span v-if="scope.row.status==='6'">{{ '已终止' }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="updateUserNmae" label="当前处理人" align="center"/>
+      <el-table-column prop="tpUserNmae" label="当前处理人" align="center"/>
       <el-table-column prop="updateDate" label="最近操作时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column> 
     </el-table>
     <div class="block">
@@ -192,9 +189,12 @@ export default {
       }
       var value = new Date(val)
       var year = value.getFullYear()
-      var month = value.getMonth() + 1
-      var day = value.getDate()
-      return year + '-' + month + '-' + day
+      var month = this.padDate(value.getMonth() + 1)
+      var day = this.padDate(value.getDate())
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
     }
   }
 }