工单管理-改动

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()));
     }
 }

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));
+    }
 }