Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java

@@ -6,8 +6,10 @@ import com.community.commom.session.UserElement;
 import com.community.huiju.dao.TpBillInvoiceMapper;
 import com.community.huiju.dao.TpBillMapper;
 import com.community.huiju.dao.TpMessageMapper;
+import com.community.huiju.dao.TpTicketMapper;
 import com.community.huiju.model.TpBill;
 import com.community.huiju.model.TpMessage;
+import com.community.huiju.model.TpTicket;
 import com.community.huiju.service.MessageServiceI;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -32,6 +34,9 @@ public class MessageServiceImpl implements MessageServiceI {
 	
 	@Autowired
 	private TpBillMapper tpBillMapper;
+
+	@Autowired
+	private TpTicketMapper tpTicketMapper;
 	
 	/**
 	 * 获取消息数量
@@ -72,6 +77,13 @@ public class MessageServiceImpl implements MessageServiceI {
 				tpMessage.setContent(tpMessage.getMessageContent());
 				tpMessage.setMessageContent("");
 			}
+			// 查询工单是否待评价，如果为待评价把Content改为工单的标题
+			TpTicket tpTicket= tpTicketMapper.selectByPrimaryKey(tpMessage.getTicketId());
+			if (null != tpTicket) {
+				if (!"".equals(tpMessage.getTicketId()) && "5".equals(tpTicket.getStatus())) {
+					tpMessage.setContent(tpTicket.getTicketTitle());
+				}
+			}
 			if (!StringUtils.isEmpty(tpMessage.getMessageDetailUrl())){
 				Integer id = getMessageIdByType(tpMessage);
 				tpMessage.setMessageDetailUrl(tpMessage.getMessageDetailUrl() + "&id=" + id);