合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTicketRecordComment.java

@@ -35,6 +35,34 @@ public class TpTicketRecordComment {
      */
     private List<String> recordCommentURL;
 
+    /**
+     * 评分
+     * @param recordCommentURL
+     */
+    private String score;
+
+    /**
+     * 评语
+     * @param recordCommentURL
+     */
+    private String comment;
+
+    public String getScore() {
+        return score;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setScore(String score) {
+        this.score = score;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
     public void setRecordCommentURL(List<String> recordCommentURL) {
         this.recordCommentURL = recordCommentURL;
     }

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

@@ -3,18 +3,17 @@ package com.community.huiju.service.impl;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 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.dao.*;
 import com.community.huiju.model.TpBill;
 import com.community.huiju.model.TpMessage;
 import com.community.huiju.model.TpTicket;
+import com.community.huiju.model.TpTransaction;
 import com.community.huiju.service.MessageServiceI;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.util.Date;
@@ -28,16 +27,19 @@ import java.util.Map;
  */
 @Service("messageService")
 public class MessageServiceImpl implements MessageServiceI {
-	
+
 	@Autowired
 	private TpMessageMapper tpMessageMapper;
-	
+
 	@Autowired
 	private TpBillMapper tpBillMapper;
 
 	@Autowired
 	private TpTicketMapper tpTicketMapper;
-	
+
+	@Autowired
+	private TpTransactionMapper tpTransactionMapper;
+
 	/**
 	 * 获取消息数量
 	 * @param communityId
@@ -47,7 +49,7 @@ public class MessageServiceImpl implements MessageServiceI {
 	public Map<String, Object> getMessageTotal(Integer communityId, Integer verifyId) {
 		return tpMessageMapper.getMessageTotal(verifyId,communityId);
 	}
-	
+
 	/**
 	 * 分页获取消息或待办
 	 * @param communityId
@@ -70,12 +72,15 @@ public class MessageServiceImpl implements MessageServiceI {
 			//		tpMessage.setContent(tpBill.getBillExplain());
 			//	}
 			//}
-			
+
 			if(tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_VISITOR) || tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_ANNOUNCEMENT)
 					|| tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_SYS) || tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_BILL)
 					|| tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_ACTIVITY)){
-				tpMessage.setContent(tpMessage.getMessageContent());
-				tpMessage.setMessageContent("");
+				// 当transactionId为空时把15条临时数据的内容去掉
+				if(null == tpMessage.getTransactionId()) {
+					tpMessage.setContent(tpMessage.getMessageContent());
+					tpMessage.setMessageContent("");
+				}
 			}
 			// 查询工单是否待评价，如果为待评价把Content改为工单的标题
 			TpTicket tpTicket= tpTicketMapper.selectByPrimaryKey(tpMessage.getTicketId());
@@ -84,6 +89,11 @@ public class MessageServiceImpl implements MessageServiceI {
 					tpMessage.setContent(tpTicket.getTicketTitle());
 				}
 			}
+			// 帖子推消息设置Content帖子标题
+			TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(tpMessage.getTransactionId(),tpMessage.getCommunityId());
+			if (null != tpTransaction){
+				tpMessage.setContent(tpTransaction.getTransactionTitle());
+			}
 			if (!StringUtils.isEmpty(tpMessage.getMessageDetailUrl())){
 				Integer id = getMessageIdByType(tpMessage);
 				tpMessage.setMessageDetailUrl(tpMessage.getMessageDetailUrl() + "&id=" + id);
@@ -94,7 +104,7 @@ public class MessageServiceImpl implements MessageServiceI {
 		map.put("total",page.getTotal());
 		return map;
 	}
-	
+
 	/**
 	 * 根据不同的类型取不同的id
 	 * @param tpMessage
@@ -108,6 +118,8 @@ public class MessageServiceImpl implements MessageServiceI {
 				id = tpMessage.getAnnouncementId();
 				break;
 			case Constant.MESSAGE_TYPE_SYS:
+				// 临时用系统通知测试，后期用11话题状态
+				id = tpMessage.getTransactionId();
 				break;
 			case Constant.MESSAGE_TYPE_BILL:
 				id = tpMessage.getBillId();
@@ -116,10 +128,10 @@ public class MessageServiceImpl implements MessageServiceI {
 				id = tpMessage.getActivityId();
 				break;
 		}
-		
+
 		return id;
 	}
-	
+
 	/**
 	 * 消息全部已读
 	 */

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

@@ -638,7 +638,7 @@ public class SocialServiceImpl implements SocialServiceI {
             }
         }
         // 推消息
-        TpMessage  tpMessage=new TpMessage(null,userElement.getCommunityId(),"11","1","1", tpTransactionReplyBack.getUuid(),"1","2",  userElement.getUserName()+":"+tpTransactionReply.getReplyContent(),
+        TpMessage  tpMessage = new TpMessage(null,userElement.getCommunityId(),"9","1","1", tpTransactionReplyBack.getUuid(),"1","2",  userElement.getUserName()+":"+tpTransactionReply.getReplyContent(),
                                           "1",null,null,"0",userElement.getUserVerifyId(),new Date(),null,null,null,null,null,tpTransactionReplyBack.getTransactionId());
         tpMessageMapper.insert(tpMessage);
         response.addSuccess("成功");
@@ -1209,11 +1209,6 @@ public class SocialServiceImpl implements SocialServiceI {
         /*当前工单发起人房产*/
         ticketVO.setHouseProperty(taUserVerify.getPhaseName()+taUserVerify.getBuildingName()+taUserVerify.getUnitName()+taUserVerify.getLevelName()+taUserVerify.getRoomNoName());
 
-
-
-
-
-
         /*查询工单类容的图片*/
         List<TdImages> tdImages = tdImagesMapper.selectImages(tickedID,Constant.SERVICE);
         List<String> contentImg = new ArrayList<String>();
@@ -1229,6 +1224,13 @@ public class SocialServiceImpl implements SocialServiceI {
         for (TpTicketRecord ticketRecord : ticketRecordList) {
             /*对话详情*/
             List<TpTicketRecordComment> tpTicketRecordCommentList = tpTicketRecordCommentMapper.selectList(tickedID,ticketRecord.getId());
+            /*当status=5(待评价时)*/
+             if ("5".equals(ticketRecord.getStatus())){
+                 TpTicketRecordComment tpTicketRecordComment= new TpTicketRecordComment();
+                 tpTicketRecordComment.setScore(ticketVO.getScore());
+                 tpTicketRecordComment.setComment(ticketVO.getComment());
+                 tpTicketRecordCommentList.add(tpTicketRecordComment);
+             }
             ticketRecord.setStatusContent(tpTicketRecordCommentList);
             /* 遍历当前对话信息组装图片*/
             for (TpTicketRecordComment tpTicketRecordComment : tpTicketRecordCommentList) {

CODE/smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml

@@ -29,6 +29,7 @@
     <result column="bill_id" property="billId" jdbcType="INTEGER" />
     <result column="activity_id" property="activityId" jdbcType="INTEGER" />
     <result column="announcement_id" property="announcementId" jdbcType="INTEGER" />
+    <result column="transaction_id" property="transactionId" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, ticket_id,community_id, message_type, advice_type, model_type, uuid, uuid_type, source,
@@ -326,6 +327,7 @@
         t.bill_id,
         t.activity_id,
         t.announcement_id,
+        t.transaction_id,
         k.status,
         r.content,
         d.name as ticket_status,

CODE/smart-community/app-api/src/main/resources/mapper/TpTicketRecordCommentMapper.xml

@@ -181,7 +181,7 @@
     LIMIT 1
   </select>
   <select id="selectList" resultMap="BaseResultMap">
-    select * from  tp_ticket_record_comment WHERE ticket_id =#{tickedID} and ticket_record_id = #{recordId}  ;
+    select * from  tp_ticket_record_comment WHERE ticket_id =#{tickedID} and ticket_record_id = #{recordId}
   </select>
 
 </mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpShop.java

@@ -144,4 +144,10 @@ public class TpShop implements Serializable {
      */
     @TableField(exist = false)
     private List<String> appCarouselImg;
+
+    /**
+     * 评价总数
+     */
+    @TableField(exist = false)
+    private int evaluateSum;
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java

@@ -396,7 +396,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 			tdImages.setCreateUser(userElement.getId());
 			tdImagesMapper.insert(tdImages);
 		}
-		Message  tpMessage=new Message(null,userElement.getCommunityId(),"11","1","1", tpTransaction.getUuid(),"1","2",  userElement.getUserName()+":"+ replyContent,
+		Message  tpMessage=new Message(null,userElement.getCommunityId(),"9","1","1", tpTransaction.getUuid(),"1","2",  userElement.getUserName()+":"+ replyContent,
 				"1",null,null,"0",userElement.getUserVerifyId(),LocalDateTime.now(),null,null,null,null,null,tpTransaction.getId());
 		tpMessageMapper.insert(tpMessage);
 		response.addSuccess("成功");

CODE/smart-community/property-api/src/main/resources/mapper/ShopAppraisalMapper.xml

@@ -13,7 +13,7 @@
         LEFT JOIN tp_shop_appraisal_replay ar ON sa.id = ar.shop_appraisal_id
         <where>
             <if test="id !=null and id != ''">
-                and sa.id like concat('%',#{id},'%')
+                and s.id like concat('%',#{id},'%')
             </if>
             <if test="shopName !=null and shopName != ''">
                 and s.shop_name like concat('%',#{shopName},'%')

CODE/smart-community/property-api/src/main/resources/mapper/TpShopMapper.xml

@@ -13,7 +13,8 @@
             t.update_date,
             s.type_name,
             i.img_url,
-            u.user_name
+            u.user_name,
+           (SELECT COUNT(sa.shop_id) FROM  tp_shop_appraisal sa WHERE t.id = sa.shop_id) AS evaluateSum
         FROM
             tp_shop t
             LEFT JOIN tp_shop_img i ON t.id = i.shop_id AND i.img_type = 1

VUECODE/smart-property-manage/src/api/shopType.js

@@ -114,7 +114,7 @@ export function shopAppraisalList(data) {
     url: '/shopAppraisalList',
     method: 'get',
     params: {
-      id: data.id,
+      id: data.shopId,
       shopName: data.shopName,
       score: data.score,
       content: data.content,

VUECODE/smart-property-manage/src/views/shop/shopIndex.vue

@@ -60,6 +60,15 @@
         </template>
       </el-table-column>
       <el-table-column prop="updateDate" label="编辑时间" align="center" ><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
+      <el-table-column  label="业主评价" align="center" >
+        <template slot-scope="scope">
+         <a>
+           <span style="color: #63B8FF" v-if="scope.row.evaluateSum > 0" @click="evaluateSum(scope.row.id)">{{ scope.row.evaluateSum }}</span>
+           <span style="color: #666666" v-if="scope.row.evaluateSum === 0">{{ scope.row.evaluateSum }}</span>
+         </a>
+         
+        </template>
+      </el-table-column>
       <el-table-column prop="userName" label="编辑人" align="center"/>
     </el-table>
     <div class="block">
@@ -279,6 +288,9 @@ export default {
       var seconds = value.getSeconds()
       // return year + '-' + month + '-' + day
       return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+    },
+    evaluateSum(id){
+       this.$router.push({ name: 'shop-shopReplay', query: { id: id }})
     }
   }
 }

VUECODE/smart-property-manage/src/views/shop/shopReplay/index.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item class="filter-item"  label="商铺编号">
-        <el-input v-model="listQuery.id"  placeholder="商铺编号"/>
+        <el-input v-model="listQuery.shopId"  placeholder="商铺编号"/>
       </el-form-item>
       <el-form-item class="filter-item"  label="商铺名称">
         <el-input v-model="listQuery.shopName" placeholder="商铺名称"/>
@@ -50,7 +50,9 @@
       <el-table-column
         type="selection"
         width="55"/>
-      <el-table-column prop="id" label="序号" align="center"/>
+      <el-table-column type="index" width="55" label="序号"/>
+      <!-- <el-table-column prop="id" label="序号" align="center"/> -->
+       <el-table-column prop="shopId" label="商铺编号" align="center"/>
       <el-table-column prop="roomName" label="商铺名称" align="center">
          <template slot-scope="scope" >
           <a>
@@ -135,6 +137,7 @@ export default {
     data() {
         return {
           listQuery: {
+            shopId: '',
             id: '',
             shopName: '',
             score: '',
@@ -160,7 +163,9 @@ export default {
         }
     },
     mounted(){
+    this.listQuery.shopId = this.$route.query.id
     this.dataQuery()
+    this.listQuery.shopId = ''
     },
     methods:{
     dataQuery() { // 查询数据