工单管理-工单列表入参
This commit is contained in:
@ -41,10 +41,10 @@ public class EmsTicketController extends BaseController
|
|||||||
*/
|
*/
|
||||||
@PreAuthorize("@ss.hasPermi('system:ticket:list')")
|
@PreAuthorize("@ss.hasPermi('system:ticket:list')")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo list(EmsTicket emsTicket)
|
public TableDataInfo list(Long[] status)
|
||||||
{
|
{
|
||||||
startPage();
|
startPage();
|
||||||
List<TicketListVo> list = emsTicketService.getAllTicketList(emsTicket);
|
List<TicketListVo> list = emsTicketService.getAllTicketList(status);
|
||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2,6 +2,7 @@ package com.xzzn.ems.mapper;
|
|||||||
|
|
||||||
import com.xzzn.ems.domain.EmsTicket;
|
import com.xzzn.ems.domain.EmsTicket;
|
||||||
import com.xzzn.ems.domain.vo.TicketListVo;
|
import com.xzzn.ems.domain.vo.TicketListVo;
|
||||||
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -70,10 +71,10 @@ public interface EmsTicketMapper
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取工单列表
|
* 获取工单列表
|
||||||
* @param emsTicket
|
* @param statusList
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public List<TicketListVo> getAllTicketList(EmsTicket emsTicket);
|
public List<TicketListVo> getAllTicketList(@Param("statusList")Long[] statusList);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 工单详情
|
* 工单详情
|
||||||
|
|||||||
@ -69,10 +69,10 @@ public interface IEmsTicketService
|
|||||||
public int dropEmsTicketById(String id);
|
public int dropEmsTicketById(String id);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取工单列表
|
* 获取工单列表 - 根据工单状态获取
|
||||||
*
|
*
|
||||||
* @param emsTicket 工单主
|
* @param statusList 工单主
|
||||||
* @return 工单主集合
|
* @return 工单主集合
|
||||||
*/
|
*/
|
||||||
public List<TicketListVo> getAllTicketList(EmsTicket emsTicket);
|
public List<TicketListVo> getAllTicketList(Long[] statusList);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,7 +25,7 @@ public class EmsTicketServiceImpl implements IEmsTicketService
|
|||||||
private EmsTicketMapper emsTicketMapper;
|
private EmsTicketMapper emsTicketMapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询工单主
|
* 查询工单主-工单详情
|
||||||
*
|
*
|
||||||
* @param id 工单主主键
|
* @param id 工单主主键
|
||||||
* @return 工单主
|
* @return 工单主
|
||||||
@ -62,6 +62,7 @@ public class EmsTicketServiceImpl implements IEmsTicketService
|
|||||||
String nowDate = DateUtils.dateTime();
|
String nowDate = DateUtils.dateTime();
|
||||||
ticketNo = "T" + nowDate + String.format("%06d", new Random().nextInt(1000000));
|
ticketNo = "T" + nowDate + String.format("%06d", new Random().nextInt(1000000));
|
||||||
emsTicket.setTicketNo(ticketNo);
|
emsTicket.setTicketNo(ticketNo);
|
||||||
|
emsTicket.setStatus(1L);//默认待处理
|
||||||
emsTicket.setCreateTime(DateUtils.getNowDate());
|
emsTicket.setCreateTime(DateUtils.getNowDate());
|
||||||
return emsTicketMapper.insertEmsTicket(emsTicket);
|
return emsTicketMapper.insertEmsTicket(emsTicket);
|
||||||
}
|
}
|
||||||
@ -115,8 +116,13 @@ public class EmsTicketServiceImpl implements IEmsTicketService
|
|||||||
return emsTicketMapper.dropEmsTicketById(id);
|
return emsTicketMapper.dropEmsTicketById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据工单状态数组获取-工单列表
|
||||||
|
* @param statusList
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<TicketListVo> getAllTicketList(EmsTicket emsTicket) {
|
public List<TicketListVo> getAllTicketList(Long[] statusList) {
|
||||||
return emsTicketMapper.getAllTicketList(emsTicket);
|
return emsTicketMapper.getAllTicketList(statusList);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -134,6 +134,12 @@
|
|||||||
LEFT JOIN sys_user s on t.user_id = s.user_id
|
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
|
LEFT JOIN sys_user s1 on t.work_user_id = s1.user_id
|
||||||
where isDelete = 1
|
where isDelete = 1
|
||||||
|
<if test="statusList != null and statusList.length > 0">
|
||||||
|
AND t.status IN
|
||||||
|
<foreach collection="statusList" item="status" open="(" separator="," close=")">
|
||||||
|
#{status}
|
||||||
|
</foreach>
|
||||||
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getTicketDetailInfo" resultType="com.xzzn.ems.domain.vo.TicketListVo">
|
<select id="getTicketDetailInfo" resultType="com.xzzn.ems.domain.vo.TicketListVo">
|
||||||
|
|||||||
Reference in New Issue
Block a user