|
@@ -44,8 +44,8 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
|
|
|
PersonnelVO personnelVO = cacheUtil.getLoginUser(loginUtils.getId());
|
|
|
ticket.setCreateId(personnelVO.getUuid());
|
|
|
ticket.setTicketProgress(0);
|
|
|
- String num = BatchNoUtil.getBatchNo();
|
|
|
- ticket.setNum(num);
|
|
|
+ String num = BatchNoUtil.getBatchNo();
|
|
|
+ ticket.setNum(num);
|
|
|
} else {
|
|
|
ticket = this.getById(ticket.getId());
|
|
|
ticket.setName(ticketAddDTO.getName());
|
|
@@ -83,13 +83,13 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
|
|
|
List<TicketVO> ticketVOS = this.loadTicketVO(tickets);
|
|
|
Records records = new Records();
|
|
|
records.setData(ticketVOS);
|
|
|
- records.setCurrent((long)pageNum);
|
|
|
- records.setSize((long)pageSize);
|
|
|
+ records.setCurrent((long) pageNum);
|
|
|
+ records.setSize((long) pageSize);
|
|
|
records.setTotal(ticketPage.getTotal());
|
|
|
return records;
|
|
|
}
|
|
|
|
|
|
- public List<TicketVO> loadTicketVO(List<Ticket> tickets){
|
|
|
+ public List<TicketVO> loadTicketVO(List<Ticket> tickets) {
|
|
|
List<TicketVO> ticketVOS = new ArrayList<>();
|
|
|
if (!tickets.isEmpty()) {
|
|
|
List<String> createIds = new ArrayList<>();
|
|
@@ -153,7 +153,7 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
|
|
|
private Boolean ifHavePermission(String id) {
|
|
|
PersonnelVO personnelVO = cacheUtil.getLoginUser(loginUtils.getId());
|
|
|
personnelVO.getPersonType();
|
|
|
- if (personnelVO.getPersonType().equals(0) || (id!=null&&personnelVO.getId().equals(id))) {
|
|
|
+ if (personnelVO.getPersonType().equals(0) || (id != null && personnelVO.getId().equals(id))) {
|
|
|
return true;
|
|
|
}
|
|
|
return false;
|