合并

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

@@ -430,7 +430,7 @@ public class SocialController extends BaseController {
     @ApiOperation(value = "二手帖子对话", notes = "二手帖子对话")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "transactionId:当前帖子ID,replyContent:回复内容，replyId：被回复的评论ID，imgArr:可多张[]"),
+                    "transactionId:当前帖子ID,replyContent:回复内容，replyId：被回复的评论ID，imgArr:可多张[],state:此参数用于判断是否是物业"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addTransactionReply", method = RequestMethod.POST)

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

@@ -583,19 +583,31 @@ public class SocialServiceImpl implements SocialServiceI {
     public ResponseBean addTransactionReply(String paramets, UserElement userElement) {
         ResponseBean response = new ResponseBean();
         JSONObject object = JSONObject.parseObject(paramets);
+        Integer state = object.getInteger("state");
+        TpUser tpUser = tpUserMapper.selectLoginName(userElement.getLoginName(),userElement.getCommunityId());
         JSONArray array = object.getJSONArray("imgArr");
         String[] reply = null;
         if (null != array) {
             reply = array.toArray(new String[]{});
         }
         TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
-        TpTransactionReply tpTransactionReply = JSONObject.parseObject(paramets, TpTransactionReply.class);
-        tpTransactionReply.setCommunityId(userElement.getCommunityId());
-        tpTransactionReply.setUuid(userElement.getUserVerifyId());
-        tpTransactionReply.setUuidType("app");
-        tpTransactionReply.setUuidName(userElement.getUserName());
-        tpTransactionReply.setUuidRole(taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId()).getDescription());
 
+        TpTransactionReply tpTransactionReply = JSONObject.parseObject(paramets, TpTransactionReply.class);
+        // 我1时代表物业端身份评论
+        int current = state.intValue();
+        if (1==current){
+            tpTransactionReply.setCommunityId(userElement.getCommunityId());
+            tpTransactionReply.setUuid( tpUser.getId());
+            tpTransactionReply.setUuidType("prop");
+            tpTransactionReply.setUuidName(tpUser.getUserName());
+            tpTransactionReply.setUuidRole("物业");
+        }else {
+            tpTransactionReply.setCommunityId(userElement.getCommunityId());
+            tpTransactionReply.setUuid(userElement.getUserVerifyId());
+            tpTransactionReply.setUuidType("app");
+            tpTransactionReply.setUuidName(userElement.getUserName());
+            tpTransactionReply.setUuidRole(taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId()).getDescription());
+        }
         TpTransactionReply tpTransactionReplyBack = new TpTransactionReply();
         TpTransaction tpTransaction = new TpTransaction();
         //replyId为空的情况下被回复人就是帖子的创建人

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

@@ -460,6 +460,21 @@ public class TicketServiceImpl implements ITicketService {
             tpTicketRecord.setCreateUser(userId);
             tpTicketRecord.setCreateDate(new Date());
             tpTicketRecordMapper.insertSelective(tpTicketRecord);
+            // 终止后维护tp_ticket_record_comment对话
+            Integer createUser= tpTicketMapper.selectByPrimaryKey(ticketId).getCreateUser();
+            TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(createUser);
+
+            TaUser taUser= taUserMapper.selectByPrimaryKey(taUserVerify.getUserId());
+            TpTicketRecordComment tpTicketRecordComment = new TpTicketRecordComment();
+            tpTicketRecordComment.setCommunityId(communityId);
+            tpTicketRecordComment.setTicketId(ticketId);
+            tpTicketRecordComment.setTicketRecordId(tpTicketRecord.getId());
+            tpTicketRecordComment.setUuid(userId);
+            tpTicketRecordComment.setUuid(taUserVerify.getId());
+            tpTicketRecordComment.setUserName(taUser.getUserName());
+            tpTicketRecordComment.setCreateDate(new Date());
+            tpTicketRecordCommentMapper.insertSelective(tpTicketRecordComment);
+
             //1.5版本需求推送消息
             TpMessage tpMessage= new TpMessage();
                       tpMessage.setTicketId(ticketId);

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

@@ -23,7 +23,7 @@
     delete from tp_ticket_record
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TpTicketRecord" >
+  <insert id="insert" parameterType="com.community.huiju.model.TpTicketRecord" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
     insert into tp_ticket_record (id, community_id, ticket_id, content,
       status, create_user, create_date
       )
@@ -31,7 +31,7 @@
       #{content,jdbcType=VARCHAR}, #{status,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TpTicketRecord" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpTicketRecord" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
     insert into tp_ticket_record
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >