合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -367,7 +367,7 @@ public class SocialController extends BaseController {
     public ResponseBean deleteTransaction(HttpSession session, @PathVariable("id") String id) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.deleteransaction(Integer.valueOf(id),userId);
+        ResponseBean response = socialServiceI.deleteransaction(Integer.valueOf(id),userElement);
         return response;
     }
 

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

@@ -1,7 +1,9 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.SysReportReason;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface SysReportReasonMapper {
     int deleteByPrimaryKey(Integer id);
 

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

@@ -46,4 +46,11 @@ public interface TpMessageMapper {
      * 查询工单id是否为空
      */
     Integer selectTicket(@Param(value = "communityId") Integer ticketId);
+
+    /**
+     * 根据条件查询消息
+     * @param map
+     * @return
+     */
+    TpMessage selectConditionsTpMessage(Map<String, Object> map);
 }

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

@@ -1,8 +1,10 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.TpTransactionReport;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+@Mapper
 public interface TpTransactionReportMapper {
     int deleteByPrimaryKey(Integer id);
 

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

@@ -1,6 +1,7 @@
 package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.model.*;
 
 import java.io.IOException;
@@ -151,7 +152,7 @@ public interface SocialServiceI {
  	 * @param id
 	 * @return
 	 */
-	ResponseBean deleteransaction(Integer id,Integer userid);
+	ResponseBean deleteransaction(Integer id, UserElement userElement);
 	
 	/**
 	 * 获取举报原因列表

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

@@ -3,6 +3,7 @@ package com.community.huiju.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ImageServiceI;
@@ -454,14 +455,35 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public ResponseBean deleteransaction(Integer id,Integer userId) {
+    public ResponseBean deleteransaction(Integer id, UserElement userElement) {
         ResponseBean responseBean= new ResponseBean();
         TpTransaction tpTransaction=tpTransactionMapper.getById(Integer.valueOf(id));
-        if(null!= tpTransaction && userId.equals(tpTransaction.getTaUserId())) {
+        if(null!= tpTransaction && userElement.getId().equals(tpTransaction.getTaUserId())) {
             tpTransaction.setStatus("0");
             tpTransaction.setUpdateDate(new Date());
             tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
             responseBean.addSuccess("删除成功");
+
+
+
+            // 把消息变为无效
+            Map<String, Object> map = new HashMap<>();
+            map.put("communityId", userElement.getCommunityId());
+            map.put("messageType", "9");
+            map.put("adviceType", "4");
+            map.put("uuidType", "2");
+            map.put("source", "1");
+            map.put("status", "1");
+            map.put("modelType", "1");
+            map.put("transactionId", tpTransaction.getId());
+            TpMessage tpMessage = tpMessageMapper.selectConditionsTpMessage(map);
+            if (null != tpMessage) {
+                tpMessage.setStatus("0");
+                tpMessageMapper.updateByPrimaryKeySelective(tpMessage);
+            }
+
+
+
         }else {
             responseBean.addSuccess("当前ID不存在");
         }
@@ -524,6 +546,8 @@ public class SocialServiceImpl implements SocialServiceI {
             message.setModelType("2");
             //超级管理员
             message.setUuid(toCommunitiesMapper.selectAndmin(communityId));
+            message.setModelType("1");
+            message.setUuid(userId);
             message.setUuidType("2");
             message.setSource("1");
             message.setMessageContent("{" + taUser.getUserName() + "}举报了{" + createUser.getUserName() + "}发布的帖子：{" + tpTransaction.getTransactionTitle() +  "}，举报原因：{" + sysReportReason.getReason() + "}，点击责令发布人修改或直接作废帖子");

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

@@ -314,19 +314,22 @@ public class TicketServiceImpl implements ITicketService {
         message.setUuidType("2");
         message.setSource("2");
         //当前插入为超级管理员
-        Integer uuserID= toCommunitiesMapper.selectAndmin(user.getCommunityId());
-        message.setUuid(uuserID);
-         TaSysUserRole taSysUserRole= taSysUserRoleMapper.selectRole(userId,user.getCommunityId());
+         Integer uuserID= toCommunitiesMapper.selectAndmin(user.getCommunityId());
+         message.setUuid(uuserID);
+         TaSysUserRole taSysUserRole= taSysUserRoleMapper.selectRole(user.getCommunityId(), userId);
          String userName = null;
-        if("1".equals(taSysUserRole.getRoleId())){userName="业主"; }
-        if("2".equals(taSysUserRole.getRoleId())){userName="家属" ;}
-        if("3".equals(taSysUserRole.getRoleId())){userName="租客" ;}
-        message.setMessageContent(userName+user.getUserName()+"发起了一个工单“"+tpTicket.getTicketTitle()+"”，点击受理分配给合适的人处理");
-        message.setStatus("1");
-        message.setReadStatus("0");
-        message.setCreateUser(userId);
-        message.setCreateDate(new Date());
-        tpMessageMapper.insert(message);
+         if (null != taSysUserRole) {
+             if(1 == taSysUserRole.getRoleId().intValue()){userName="业主"; }
+             if(2 == taSysUserRole.getRoleId().intValue()){userName="家属" ;}
+             if(3 == taSysUserRole.getRoleId().intValue()){userName="租客" ;}
+             message.setMessageContent(userName+user.getUserName()+"发起了一个工单“"+tpTicket.getTicketTitle()+"”，点击受理分配给合适的人处理");
+             message.setStatus("1");
+             message.setReadStatus("0");
+             message.setCreateUser(userId);
+             message.setCreateDate(new Date());
+             tpMessageMapper.insert(message);
+         }
+
         response.addSuccess(tpTicketReco);
         return response;
     }

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

@@ -94,7 +94,7 @@
     where community_id = #{communityId,jdbcType=INTEGER} and user_id = #{userId,jdbcType=INTEGER}
   </select>
 
-  <select id="selectRole">
+  <select id="selectRole" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from ta_sys_user_role

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

@@ -390,4 +390,37 @@
     tp_message
     when ticket_id=#{ticketId}
   </select>
+  <select id="selectConditionsTpMessage" resultMap="BaseResultMap" parameterType="map">
+    SELECT
+        *
+    FROM
+        tp_message
+    WHERE
+    <trim prefixOverrides="and | or">
+      <if test="map.communityId != null">
+        and community_id = #{map.communityId}
+      </if>
+      <if test="map.messageType != null">
+        and message_type = #{map.messageType}
+      </if>
+      <if test="map.adviceType != null">
+        and advice_type = #{map.adviceType}
+      </if>
+      <if test="map.uuidType != null">
+        and uuid_type = #{map.uuidType}
+      </if>
+      <if test="map.source != null">
+        and source = #{map.source}
+      </if>
+      <if test="map.status != null">
+        and status = #{map.status}
+      </if>
+      <if test="map.transactionId != null">
+        and transaction_id = #{map.transactionId}
+      </if>
+      <if test="map.modelType != null">
+        and model_type = #{map.modelType}
+      </if>
+    </trim>
+  </select>
 </mapper>