合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpMessageMapper.java

@@ -52,7 +52,7 @@ public interface TpMessageMapper {
      * @param map
      * @return
      */
-    TpMessage selectConditionsTpMessage(Map<String, Object> map);
+    TpMessage selectConditionsTpMessage(@Param("map")Map<String, Object> map);
 
     /**
      * 根据条件查询 消息代办

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

@@ -449,7 +449,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
             // 把消息变为无效
             Map<String, Object> map = new HashMap<>();
-            map.put("communityId", userElement.getCommunityId());
+            map.put("communityId", tpTransaction.getCommunityId());
             map.put("messageType", "9");
             map.put("adviceType", "4");
             map.put("uuidType", "2");

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

@@ -269,7 +269,7 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
             for (String count:messageArr) {
                 TpMessage message = new TpMessage();
                 message.setCommunityId(userVerify.getCommunityId());
-                message.setMessageType("6");
+                message.setMessageType("9");
                 message.setAdviceType("1");
                 message.setModelType("1");
                 message.setUuid(userElement.getId());

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

@@ -316,10 +316,9 @@
         t.uuid_type,
         t.source,
         t.message_content,
-        t.STATUS,
         t.result,
         t.meaasge_type_id,
-        t.read_status,
+        t.read_status ,
         t.create_user,
         t.create_date,
         t.update_user,

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

@@ -273,6 +273,7 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
             and t.type = #{type,jdbcType=INTEGER}
         </if>
         AND y.community_id = #{communityId,jdbcType=INTEGER}
+        AND t.status = 1
         AND y.transaction_id NOT IN ( SELECT t.id FROM tp_transaction t WHERE t.create_user = #{id,jdbcType=INTEGER} AND
         t.community_id = #{communityId,jdbcType=INTEGER} )
         GROUP BY

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

@@ -312,7 +312,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         for (String count : messageArr) {
             Message message = new Message();
             message.setCommunityId(userVerify.getCommunityId());
-            message.setMessageType("6");
+            message.setMessageType("9");
             message.setAdviceType("1");
             message.setModelType("1");
             message.setUuid(user.getId());

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

@@ -115,7 +115,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         for (String count : messageArr) {
             Message message = new Message();
             message.setCommunityId(userVerify.getCommunityId());
-            message.setMessageType("6");
+            message.setMessageType("9");
             message.setAdviceType("1");
             message.setModelType("1");
             message.setUuid(userVerify.getUserId());
@@ -249,7 +249,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         for (String count : messageArr) {
             Message message = new Message();
             message.setCommunityId(userVerify.getCommunityId());
-            message.setMessageType("6");
+            message.setMessageType("9");
             message.setAdviceType("1");
             message.setModelType("1");
             message.setUuid(userVerify.getUserId());

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

@@ -22,7 +22,6 @@
         LEFT JOIN tp_transaction_like li ON t.id = li.transaction_id AND li.like_status=1
         LEFT JOIN tp_transaction_reply re ON t.id = re.transaction_id
         WHERE t.community_id =#{communityId}
-        and t.status=1
         <if test="id != null and id != '' or id ==0">
             and t.id like concat('%',#{id},'%')
         </if>

VUECODE/smart-property-manage/src/views/social/transaction/index.vue

@@ -28,7 +28,6 @@
     <div class="button">
       <el-button type="primary" @click="add">添加</el-button>
       <el-button type="warning" @click="edit">修改</el-button>
-      <el-button type="danger" @click="deleteTransaction">作废</el-button>
     </div>
     <el-table
       v-loading="listLoading"
@@ -53,6 +52,9 @@
       <el-table-column prop="transactionTitle" label="话题标题" align="center">
       <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.transactionTitle }}</span></a></template>
       </el-table-column>
+      <el-table-column prop="status" label="是否作废" align="center">
+      <template slot-scope="scope">{{ scope.row.status=='0'?'已作废':'' }}</template>
+      </el-table-column>
       <el-table-column prop="userName" label="发布人" align="center"/>
       <el-table-column prop="createDate" label="发布时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>