|
|
|
|
470
|
parameter.put("type", 2);
|
470
|
parameter.put("type", 2);
|
471
|
// 报修
|
471
|
// 报修
|
472
|
Page<TpTicket> pageRepairs = new Page(pageNum, pageSize);
|
472
|
Page<TpTicket> pageRepairs = new Page(pageNum, pageSize);
|
473
|
- IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageRepairs, tpTicket.getType());
|
|
|
|
|
473
|
+ IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageRepairs, tpTicket.getType(),tpTicket.getPersonId(),tpTicket.getOrgId());
|
474
|
List<TpTicket> tpTicketRepairsList = tpTicketIPage.getRecords();
|
474
|
List<TpTicket> tpTicketRepairsList = tpTicketIPage.getRecords();
|
475
|
List<TpTicketVO> repairsList = Lists.newArrayList();
|
475
|
List<TpTicketVO> repairsList = Lists.newArrayList();
|
476
|
tpTicketVOConvert(tpTicketRepairsList, repairsList);
|
476
|
tpTicketVOConvert(tpTicketRepairsList, repairsList);
|
|
|
|
|
479
|
// 1:投诉 2:报修 3:联系物业
|
479
|
// 1:投诉 2:报修 3:联系物业
|
480
|
parameter.put("type", 1);
|
480
|
parameter.put("type", 1);
|
481
|
Page<TpTicket> pageComplaint = new Page(pageNum, pageSize);
|
481
|
Page<TpTicket> pageComplaint = new Page(pageNum, pageSize);
|
482
|
- IPage<TpTicket> tpTicketIPageComplaint = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageComplaint, tpTicket.getType());
|
|
|
|
|
482
|
+ IPage<TpTicket> tpTicketIPageComplaint = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageComplaint, tpTicket.getType(), tpTicket.getPersonId(),tpTicket.getOrgId());
|
483
|
List<TpTicket> tpTicketComplaintList = tpTicketIPageComplaint.getRecords();
|
483
|
List<TpTicket> tpTicketComplaintList = tpTicketIPageComplaint.getRecords();
|
484
|
List<TpTicketVO> complaintList = Lists.newArrayList();
|
484
|
List<TpTicketVO> complaintList = Lists.newArrayList();
|
485
|
tpTicketVOConvert(tpTicketComplaintList, complaintList);
|
485
|
tpTicketVOConvert(tpTicketComplaintList, complaintList);
|
|
|
|
|
488
|
// 1:投诉 2:报修 3:联系物业
|
488
|
// 1:投诉 2:报修 3:联系物业
|
489
|
parameter.put("type", 3);
|
489
|
parameter.put("type", 3);
|
490
|
Page<TpTicket> pageLiaison = new Page(pageNum, pageSize);
|
490
|
Page<TpTicket> pageLiaison = new Page(pageNum, pageSize);
|
491
|
- IPage<TpTicket> tpTicketIPageLiaison = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageLiaison, tpTicket.getType());
|
|
|
|
|
491
|
+ IPage<TpTicket> tpTicketIPageLiaison = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageLiaison, tpTicket.getType(),tpTicket.getPersonId(),tpTicket.getOrgId());
|
492
|
List<TpTicket> tpTicketLiaisonList = tpTicketIPageLiaison.getRecords();
|
492
|
List<TpTicket> tpTicketLiaisonList = tpTicketIPageLiaison.getRecords();
|
493
|
List<TpTicketVO> liaisonList = Lists.newArrayList();
|
493
|
List<TpTicketVO> liaisonList = Lists.newArrayList();
|
494
|
tpTicketVOConvert(tpTicketLiaisonList, liaisonList);
|
494
|
tpTicketVOConvert(tpTicketLiaisonList, liaisonList);
|
|
|
|
|
584
|
parameter.put("type", tpTicket.getType());
|
584
|
parameter.put("type", tpTicket.getType());
|
585
|
|
585
|
|
586
|
Page<TpTicket> pagelist = new Page<>(pageNum, pageSize);
|
586
|
Page<TpTicket> pagelist = new Page<>(pageNum, pageSize);
|
587
|
- IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pagelist, tpTicket.getType());
|
|
|
|
|
587
|
+ IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pagelist, tpTicket.getType(),tpTicket.getPersonId(),tpTicket.getOrgId());
|
588
|
List<TpTicket> tpTicketList = tpTicketIPage.getRecords();
|
588
|
List<TpTicket> tpTicketList = tpTicketIPage.getRecords();
|
589
|
|
589
|
|
590
|
List<TpTicketVO> tpTicketVOList = Lists.newArrayList();
|
590
|
List<TpTicketVO> tpTicketVOList = Lists.newArrayList();
|