diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsTicketController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsTicketController.java
index 1970124..754cac1 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsTicketController.java
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsTicketController.java
@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.xzzn.common.utils.poi.ExcelUtil;
 import com.xzzn.ems.domain.EmsTicket;
+import com.xzzn.ems.domain.vo.TicketListVo;
 import com.xzzn.ems.service.IEmsTicketService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +44,7 @@ public class EmsTicketController extends BaseController
     public TableDataInfo list(EmsTicket emsTicket)
     {
         startPage();
-        List<EmsTicket> list = emsTicketService.selectEmsTicketList(emsTicket);
+        List<TicketListVo> list = emsTicketService.getAllTicketList(emsTicket);
         return getDataTable(list);
     }
 
@@ -111,6 +112,6 @@ public class EmsTicketController extends BaseController
     @PostMapping("/drop")
     public AjaxResult drop(@RequestBody EmsTicket emsTicket)
     {
-        return toAjax(emsTicketService.dropEmsTicketById(emsTicket.getId()));
+        return toAjax(emsTicketService.dropEmsTicketById(emsTicket.getTicketNo()));
     }
 }
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/system/SysUserController.java b/ems-admin/src/main/java/com/xzzn/web/controller/system/SysUserController.java
index ffe93bb..842620f 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/system/SysUserController.java
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/system/SysUserController.java
@@ -3,6 +3,8 @@ package com.xzzn.web.controller.system;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import com.xzzn.system.service.impl.SysUserServiceImpl;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -52,6 +54,8 @@ public class SysUserController extends BaseController
 
     @Autowired
     private ISysPostService postService;
+    @Autowired
+    private SysUserServiceImpl sysUserServiceImpl;
 
     /**
      * 获取用户列表
@@ -253,4 +257,13 @@ public class SysUserController extends BaseController
     {
         return success(deptService.selectDeptTreeList(dept));
     }
+
+    /**
+     * 获取所有用户
+     */
+    @GetMapping("/getAllUser")
+    public AjaxResult getAllUser(SysUser user)
+    {
+        return  success(userService.selectUserList(user));
+    }
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/TicketListVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/TicketListVo.java
new file mode 100644
index 0000000..22d90ec
--- /dev/null
+++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/TicketListVo.java
@@ -0,0 +1,40 @@
+package com.xzzn.ems.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xzzn.common.annotation.Excel;
+import com.xzzn.common.core.domain.BaseEntity;
+import com.xzzn.ems.domain.EmsTicket;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 工单列表对象
+ *
+ */
+public class TicketListVo extends EmsTicket
+{
+    private static final long serialVersionUID = 1L;
+
+    // 提交人姓名
+    private String userName;
+    // 处理人姓名
+    private String workName;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getWorkName() {
+        return workName;
+    }
+
+    public void setWorkName(String workName) {
+        this.workName = workName;
+    }
+}
diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsTicketMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsTicketMapper.java
index f944a4c..7dcf5a9 100644
--- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsTicketMapper.java
+++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsTicketMapper.java
@@ -1,6 +1,7 @@
 package com.xzzn.ems.mapper;
 
 import com.xzzn.ems.domain.EmsTicket;
+import com.xzzn.ems.domain.vo.TicketListVo;
 
 import java.util.List;
 
@@ -66,4 +67,11 @@ public interface EmsTicketMapper
      * @return
      */
     public int dropEmsTicketById(String id);
+
+    /**
+     * 获取工单列表
+     * @param emsTicket
+     * @return
+     */
+    public List<TicketListVo> getAllTicketList(EmsTicket emsTicket);
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsTicketService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsTicketService.java
index 7fe9993..6eac8e2 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsTicketService.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsTicketService.java
@@ -1,6 +1,7 @@
 package com.xzzn.ems.service;
 
 import com.xzzn.ems.domain.EmsTicket;
+import com.xzzn.ems.domain.vo.TicketListVo;
 
 import java.util.List;
 
@@ -66,4 +67,12 @@ public interface IEmsTicketService
      * @return
      */
     public int dropEmsTicketById(String id);
+
+    /**
+     * 获取工单列表
+     *
+     * @param emsTicket 工单主
+     * @return 工单主集合
+     */
+    public List<TicketListVo> getAllTicketList(EmsTicket emsTicket);
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsTicketServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsTicketServiceImpl.java
index f9917ec..a63f057 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsTicketServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsTicketServiceImpl.java
@@ -1,8 +1,11 @@
 package com.xzzn.ems.service.impl;
 
 import java.util.List;
+import java.util.Random;
+
 import com.xzzn.common.utils.DateUtils;
 import com.xzzn.ems.domain.EmsTicket;
+import com.xzzn.ems.domain.vo.TicketListVo;
 import com.xzzn.ems.mapper.EmsTicketMapper;
 import com.xzzn.ems.service.IEmsTicketService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +57,11 @@ public class EmsTicketServiceImpl implements IEmsTicketService
     @Override
     public int insertEmsTicket(EmsTicket emsTicket)
     {
+        // 工单号随机生产
+        String ticketNo = "";
+        String nowDate = DateUtils.dateTime();
+        ticketNo = "T" + nowDate + String.format("%06d", new Random().nextInt(1000000));
+        emsTicket.setTicketNo(ticketNo);
         emsTicket.setCreateTime(DateUtils.getNowDate());
         return emsTicketMapper.insertEmsTicket(emsTicket);
     }
@@ -106,4 +114,9 @@ public class EmsTicketServiceImpl implements IEmsTicketService
     {
         return emsTicketMapper.dropEmsTicketById(id);
     }
+
+    @Override
+    public List<TicketListVo> getAllTicketList(EmsTicket emsTicket) {
+        return emsTicketMapper.getAllTicketList(emsTicket);
+    }
 }
diff --git a/ems-system/src/main/resources/mapper/ems/EmsTicketMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsTicketMapper.xml
index f0901b2..eb0041e 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsTicketMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsTicketMapper.xml
@@ -114,4 +114,19 @@
     <update id="dropEmsTicketById" parameterType="String">
         update ems_ticket set isDelete = 0 where id = #{id}
     </update>
+
+    <select id="getAllTicketList" resultType="com.xzzn.ems.domain.vo.TicketListVo">
+        SELECT t.ticket_no as ticketNo,
+               t.title as title,
+               t.content as content,
+               t.`status` as status,
+               s.user_name as userName,
+               s1.user_name as workName,
+               t.create_time as createTime,
+               t.id
+        FROM ems_ticket t
+                 LEFT JOIN sys_user s on t.user_id = s.user_id
+                 LEFT JOIN sys_user s1 on t.work_user_id = s1.user_id
+        where isDelete = 1
+        </select>
 </mapper>
\ No newline at end of file