合并

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/CommunityServiceImpl.java

@@ -46,6 +46,9 @@ public class CommunityServiceImpl implements CommunityServiceI {
 
 	@Autowired
 	private TaUserMapper taUserMapper;
+
+	@Autowired
+	private  TaUserVerifyMapper taUserVerifyMapper;
 	/**
 	 * 分页获取小区列表
 	 * @param toCommunities
@@ -85,6 +88,11 @@ public class CommunityServiceImpl implements CommunityServiceI {
 			taUser.setUserName(toCommunities.getUserName());
 			taUser.setStatus("1");
 			taUserMapper.insert(taUser);
+
+			TaUserVerify  taUserVerify= new TaUserVerify();
+			taUserVerify.setUserId(taUser.getId());
+			taUserVerify.setCommunityId(toCommunities.getId());
+
 		}
 
 

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

@@ -211,7 +211,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         message.setModelType("1");
         message.setUuidType("1");
         message.setSource("2");
-        message.setMessageContent(content);
+        message.setMessageContent("物业回复您:"+content);
         message.setStatus("1");
         message.setReadStatus("0");
         message.setCreateUser(tpTicket.getCreateUser());
@@ -318,16 +318,36 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         ticketRecordComment.setContent("拒绝受理，原因——"+textContent);
         ticketRecordComment.setUserName(userName);
         ticketRecordComment.setCreateDate(LocalDateTime.now());
-        response.addSuccess("成功");
         tpTicketRecordCommentMapper.insert(ticketRecordComment);
 
         //维护1.5版本
         Message message = new Message();
+//        message.setTicketId(ticketId);
+//        message.setUpdateUser(id);
+//        message.setUpdateDate(LocalDateTime.now());
+//        message.setStatus("0");
+//        messageMapper.updateTicketMessage(message);
+
+        QueryWrapper<TpTicket> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", ticketId);
+        queryWrapper.eq("community_id", communityId);
+        TpTicket ticket = tpTicketMapper.selectOne(queryWrapper);
+        message.setCommunityId(communityId);
+        message.setMessageType(ticket.getType());
+        message.setTicketId(ticket.getId());
+        message.setAdviceType("1");
+        message.setUuid(ticket.getCreateUser());
+        message.setModelType("1");
+        message.setUuidType("1");
+        message.setSource("2");
+        message.setMessageContent("您的工单“" + ticket.getTicketTitle() + "”已被拒绝受理");
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(id);
+        message.setCreateDate(LocalDateTime.now());
         message.setTicketId(ticketId);
-        message.setUpdateUser(id);
-        message.setUpdateDate(LocalDateTime.now());
-        message.setStatus("0");
-        messageMapper.updateTicketMessage(message);
+        messageMapper.insert(message);
+        response.addSuccess("成功");
         return response;
     }
 
@@ -382,6 +402,27 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         //分配成功后这只messgae消息表status为无效
         messageMapper.updateTickMessageStatus(ticketId);
 
+        // 处理完成后推送app
+        QueryWrapper<TpTicket> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", ticketId);
+        queryWrapper.eq("community_id", communityId);
+        TpTicket ticket = tpTicketMapper.selectOne(queryWrapper);
+        Message message= new Message();
+        message.setCommunityId(communityId);
+        message.setMessageType(ticket.getType());
+        message.setTicketId(ticket.getId());
+        message.setAdviceType("1");
+        message.setUuid(ticket.getCreateUser());
+        message.setModelType("1");
+        message.setUuidType("1");
+        message.setSource("2");
+        message.setMessageContent("您的工单“" + ticket.getTicketTitle() + "”已处理完成，请查看详情");
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(id);
+        message.setCreateDate(LocalDateTime.now());
+        message.setTicketId(ticketId);
+        messageMapper.insert(message);
         response.addSuccess("成功");
         return response;
     }

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

@@ -44,7 +44,7 @@
         </div>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submitForm('ruleForm','1')">发布</el-button>
+        <el-button type="primary" style="margin-left:13%"  @click="submitForm('ruleForm','1')">发布</el-button>
       </el-form-item>
     </el-form>
   </div>