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 f1c26d9..d7e1e29 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 @@ -41,10 +41,10 @@ public class EmsTicketController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:ticket:list')") @GetMapping("/list") - public TableDataInfo list(EmsTicket emsTicket) + public TableDataInfo list(Long[] status) { startPage(); - List list = emsTicketService.getAllTicketList(emsTicket); + List list = emsTicketService.getAllTicketList(status); return getDataTable(list); } 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 60c983a..eb26916 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 @@ -2,6 +2,7 @@ package com.xzzn.ems.mapper; import com.xzzn.ems.domain.EmsTicket; import com.xzzn.ems.domain.vo.TicketListVo; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -70,10 +71,10 @@ public interface EmsTicketMapper /** * 获取工单列表 - * @param emsTicket + * @param statusList * @return */ - public List getAllTicketList(EmsTicket emsTicket); + public List getAllTicketList(@Param("statusList")Long[] statusList); /** * 工单详情 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 e8c54f0..e32bec4 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 @@ -69,10 +69,10 @@ public interface IEmsTicketService public int dropEmsTicketById(String id); /** - * 获取工单列表 + * 获取工单列表 - 根据工单状态获取 * - * @param emsTicket 工单主 + * @param statusList 工单主 * @return 工单主集合 */ - public List getAllTicketList(EmsTicket emsTicket); + public List getAllTicketList(Long[] statusList); } 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 35721d1..588cc1a 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 @@ -25,7 +25,7 @@ public class EmsTicketServiceImpl implements IEmsTicketService private EmsTicketMapper emsTicketMapper; /** - * 查询工单主 + * 查询工单主-工单详情 * * @param id 工单主主键 * @return 工单主 @@ -62,6 +62,7 @@ public class EmsTicketServiceImpl implements IEmsTicketService String nowDate = DateUtils.dateTime(); ticketNo = "T" + nowDate + String.format("%06d", new Random().nextInt(1000000)); emsTicket.setTicketNo(ticketNo); + emsTicket.setStatus(1L);//默认待处理 emsTicket.setCreateTime(DateUtils.getNowDate()); return emsTicketMapper.insertEmsTicket(emsTicket); } @@ -115,8 +116,13 @@ public class EmsTicketServiceImpl implements IEmsTicketService return emsTicketMapper.dropEmsTicketById(id); } + /** + * 根据工单状态数组获取-工单列表 + * @param statusList + * @return + */ @Override - public List getAllTicketList(EmsTicket emsTicket) { - return emsTicketMapper.getAllTicketList(emsTicket); + public List getAllTicketList(Long[] statusList) { + return emsTicketMapper.getAllTicketList(statusList); } } diff --git a/ems-system/src/main/resources/mapper/ems/EmsTicketMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsTicketMapper.xml index 665b414..fe7ef31 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsTicketMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsTicketMapper.xml @@ -134,6 +134,12 @@ 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 + + AND t.status IN + + #{status} + +