|
@@ -126,7 +126,6 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
|
126
|
126
|
Integer ticketId = object.getInteger("id");
|
127
|
127
|
TpTicketVO ticketVO= tpTicketMapper.ticketDetails(ticketId);
|
128
|
128
|
// 从taUserVerify里面获取userID
|
129
|
|
- TaUserVerify taUserVerify= taUserVerifyMapper.selectById(ticketVO.getCreateUser());
|
130
|
129
|
TaPerson taPerson = taPersonMapper.selectById(ticketVO.getPersonId());
|
131
|
130
|
/*发起人*/
|
132
|
131
|
ticketVO.setCreateUserNmae(taPerson.getName());
|
|
@@ -189,6 +188,14 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
|
189
|
188
|
String statusName= tpTicketRecordMapper.statusName(tpTicketRecord.getStatus());
|
190
|
189
|
tpTicketRecord.setStatusName(statusName);
|
191
|
190
|
}
|
|
191
|
+
|
|
192
|
+ // 是否缴费
|
|
193
|
+ ticketVO.setIsPay(false);
|
|
194
|
+ BillInvoice billInvoice = billInvoiceMapper.selectById(ticketVO.getBillInvoiceId());
|
|
195
|
+ if (null!= billInvoice && "1".equals(billInvoice.getBillStatus())){
|
|
196
|
+ ticketVO.setIsPay(true);
|
|
197
|
+ }
|
|
198
|
+
|
192
|
199
|
response.addSuccess(ticketVO);
|
193
|
200
|
return response;
|
194
|
201
|
}
|
|
@@ -299,18 +306,18 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
|
299
|
306
|
message.setCreateUser(user.toString());
|
300
|
307
|
message.setCreateDate(LocalDateTime.now());
|
301
|
308
|
message.setTicketId(ticketId);
|
302
|
|
- messageMapper.insert(message);
|
|
309
|
+// messageMapper.insert(message);
|
303
|
310
|
//如果分配给本人维护消息模板
|
304
|
311
|
if (null!=userID&userID.equals(user)){
|
305
|
312
|
message.setModelType("1");
|
306
|
|
- messageMapper.insert(message);
|
|
313
|
+// messageMapper.insert(message);
|
307
|
314
|
}
|
308
|
315
|
//分配成功后推送app
|
309
|
316
|
message.setUuidType("1");
|
310
|
317
|
message.setUuid(ticket.getCreateUser());
|
311
|
318
|
message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给:"+taUser.getUserName());
|
312
|
319
|
message.setAdviceType("1");
|
313
|
|
- messageMapper.insert(message);
|
|
320
|
+// messageMapper.insert(message);
|
314
|
321
|
response.addSuccess("成功");
|
315
|
322
|
return response;
|
316
|
323
|
}
|