Browse Source

修复bug

weiximei 6 years ago
parent
commit
12d6509fc0

+ 2
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/SysReportReasonMapper.java View File

1
 package com.community.huiju.dao;
1
 package com.community.huiju.dao;
2
 
2
 
3
 import com.community.huiju.model.SysReportReason;
3
 import com.community.huiju.model.SysReportReason;
4
+import org.apache.ibatis.annotations.Mapper;
4
 
5
 
6
+@Mapper
5
 public interface SysReportReasonMapper {
7
 public interface SysReportReasonMapper {
6
     int deleteByPrimaryKey(Integer id);
8
     int deleteByPrimaryKey(Integer id);
7
 
9
 

+ 7
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpMessageMapper.java View File

46
      * 查询工单id是否为空
46
      * 查询工单id是否为空
47
      */
47
      */
48
     Integer selectTicket(@Param(value = "communityId") Integer ticketId);
48
     Integer selectTicket(@Param(value = "communityId") Integer ticketId);
49
+
50
+    /**
51
+     * 根据条件查询消息
52
+     * @param map
53
+     * @return
54
+     */
55
+    TpMessage selectConditionsTpMessage(Map<String, Object> map);
49
 }
56
 }

+ 2
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionReportMapper.java View File

1
 package com.community.huiju.dao;
1
 package com.community.huiju.dao;
2
 
2
 
3
 import com.community.huiju.model.TpTransactionReport;
3
 import com.community.huiju.model.TpTransactionReport;
4
+import org.apache.ibatis.annotations.Mapper;
4
 import org.apache.ibatis.annotations.Param;
5
 import org.apache.ibatis.annotations.Param;
5
 
6
 
7
+@Mapper
6
 public interface TpTransactionReportMapper {
8
 public interface TpTransactionReportMapper {
7
     int deleteByPrimaryKey(Integer id);
9
     int deleteByPrimaryKey(Integer id);
8
 
10
 

+ 8
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java View File

460
             tpTransaction.setUpdateDate(new Date());
460
             tpTransaction.setUpdateDate(new Date());
461
             tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
461
             tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
462
             responseBean.addSuccess("删除成功");
462
             responseBean.addSuccess("删除成功");
463
+
464
+            // 把消息变为无效
465
+            
466
+
467
+
463
         }else {
468
         }else {
464
             responseBean.addSuccess("当前ID不存在");
469
             responseBean.addSuccess("当前ID不存在");
465
         }
470
         }
517
             // 插入消息表
522
             // 插入消息表
518
             TpMessage message = new TpMessage();
523
             TpMessage message = new TpMessage();
519
             message.setCommunityId(userId);
524
             message.setCommunityId(userId);
520
-            message.setMessageType("7");
525
+            message.setMessageType("9");
521
             message.setAdviceType("4");
526
             message.setAdviceType("4");
522
-            message.setModelType("2");
527
+            message.setModelType("1");
523
             message.setUuid(userId);
528
             message.setUuid(userId);
524
             message.setUuidType("2");
529
             message.setUuidType("2");
525
             message.setSource("1");
530
             message.setSource("1");
526
             message.setMessageContent("{" + taUser.getUserName() + "}举报了{" + createUser.getUserName() + "}发布的帖子:{" + tpTransaction.getTransactionTitle() +  "},举报原因:{" + sysReportReason.getReason() + "},点击责令发布人修改或直接作废帖子");
531
             message.setMessageContent("{" + taUser.getUserName() + "}举报了{" + createUser.getUserName() + "}发布的帖子:{" + tpTransaction.getTransactionTitle() +  "},举报原因:{" + sysReportReason.getReason() + "},点击责令发布人修改或直接作废帖子");
527
             message.setStatus("1");
532
             message.setStatus("1");
533
+            message.setReadStatus("0");
528
             message.setCreateDate(new Date());
534
             message.setCreateDate(new Date());
529
             message.setCreateUser(userId);
535
             message.setCreateUser(userId);
530
             tpMessageMapper.insertSelective(message);
536
             tpMessageMapper.insertSelective(message);

+ 28
- 0
CODE/smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml View File

390
     tp_message
390
     tp_message
391
     when ticket_id=#{ticketId}
391
     when ticket_id=#{ticketId}
392
   </select>
392
   </select>
393
+  <select id="selectConditionsTpMessage" resultMap="BaseResultMap" parameterType="map">
394
+    SELECT
395
+        *
396
+    FROM
397
+        tp_message
398
+    WHERE
399
+    <trim prefixOverrides="and | or">
400
+      <if test="map.community_id != null">
401
+        and community_id = 79
402
+      </if>
403
+      <if test="map.message_type != null">
404
+        AND message_type = 9
405
+      </if>
406
+      <if test="map.advice_type != null">
407
+        AND advice_type = 1
408
+      </if>
409
+      <if>
410
+
411
+      </if>
412
+    </trim>
413
+
414
+
415
+
416
+    AND uuid_type = 2
417
+    AND source = 1
418
+    AND STATUS = 1
419
+    AND transaction_id = 101
420
+  </select>
393
 </mapper>
421
 </mapper>