|
|
@@ -15,7 +15,9 @@ import com.huiju.estateagents.entity.TaPerson;
|
|
15
|
15
|
import com.huiju.estateagents.mapper.TaPersonMapper;
|
|
16
|
16
|
import com.huiju.estateagents.property.common.Constant;
|
|
17
|
17
|
import com.huiju.estateagents.property.dao.*;
|
|
|
18
|
+import com.huiju.estateagents.property.entity.TpRepairType;
|
|
18
|
19
|
import com.huiju.estateagents.property.exception.WisdomException;
|
|
|
20
|
+import com.huiju.estateagents.property.mapper.TpRepairTypeMapper;
|
|
19
|
21
|
import com.huiju.estateagents.property.model.*;
|
|
20
|
22
|
import com.huiju.estateagents.property.service.TpTicketService;
|
|
21
|
23
|
import com.huiju.estateagents.property.vo.TpTicketVO;
|
|
|
@@ -58,6 +60,9 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
|
|
58
|
60
|
@Autowired
|
|
59
|
61
|
private TpTicketRecordCommentMapper tpTicketRecordCommentMapper;
|
|
60
|
62
|
|
|
|
63
|
+ @Autowired
|
|
|
64
|
+ private TpRepairTypeMapper repairTypeMapper;
|
|
|
65
|
+
|
|
61
|
66
|
// @Autowired
|
|
62
|
67
|
// private MessageMapper messageMapper;
|
|
63
|
68
|
|
|
|
@@ -561,11 +566,8 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
|
|
561
|
566
|
List<TpTicketRecord> recordList = tpTicketRecordMapper.getTicketRecordByTicketId(e.getOrgId() + "", e.getId());
|
|
562
|
567
|
// 报修类型：0:公共区域 1: 房屋质量 2::户内设施 PS : 报修的情况下才有报修类型
|
|
563
|
568
|
String repairType = e.getRepairType();
|
|
564
|
|
- String repairName = repairType == null ?
|
|
565
|
|
- null : "0".equals(repairType) ?
|
|
566
|
|
- "公共区域" : "1".equals(repairType) ?
|
|
567
|
|
- "房屋质量" : "2".equals(repairType) ?
|
|
568
|
|
- "户内设施" : null;
|
|
|
569
|
+ TpRepairType tpRepairType = repairTypeMapper.selectById(repairType);
|
|
|
570
|
+ String repairName = tpRepairType.getTypeName();
|
|
569
|
571
|
tpTicketVO.setRepairName(repairName);
|
|
570
|
572
|
tpTicketVO.setStatus(recordList.get(recordList.size() - 1).getStatus());
|
|
571
|
573
|
tpTicketVO.setTicketStatusName(recordList.get(recordList.size() - 1).getTicketStatusName());
|
|
|
@@ -662,11 +664,8 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
|
|
662
|
664
|
ticket.setTicketRecordList(ticketRecordList);
|
|
663
|
665
|
// 报修类型：0:公共区域 1: 房屋质量 2::户内设施 PS : 报修的情况下才有报修类型
|
|
664
|
666
|
String repairType = ticket.getRepairType();
|
|
665
|
|
- String repairName = repairType == null ?
|
|
666
|
|
- null : "0".equals(repairType) ?
|
|
667
|
|
- "公共区域" : "1".equals(repairType) ?
|
|
668
|
|
- "房屋质量" : "2".equals(repairType) ?
|
|
669
|
|
- "户内设施" : null;
|
|
|
667
|
+ TpRepairType tpRepairType = repairTypeMapper.selectById(repairType);
|
|
|
668
|
+ String repairName = tpRepairType.getTypeName();
|
|
670
|
669
|
ticket.setRepairName(repairName);
|
|
671
|
670
|
|
|
672
|
671
|
// // 把该工单的消息变为 已读
|
