合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java

@@ -95,7 +95,7 @@ public class TpTicketController extends BaseController {
     @RequestMapping(value = "/updateTicketStatus", method = RequestMethod.POST)
     public ResponseBean updateTicketStatus(@RequestBody String parameter, HttpSession session){
         UserElement userElement = getUserElement(session);
-        ResponseBean  responseBean = tpTicketService.updateTicketStatus(parameter,userElement.getId(),userElement.getCommunityId(),userElement.getUserName());
+        ResponseBean  responseBean = tpTicketService.updateTicketStatus(parameter,userElement.getId(),userElement.getCommunityId(),userElement.getUserName(),userElement.getLoginName());
         return responseBean;
     }
 
@@ -107,7 +107,7 @@ public class TpTicketController extends BaseController {
     @RequestMapping(value = "/updateTicket", method = RequestMethod.POST)
     public ResponseBean updateTicket(@RequestBody String parameter, HttpSession session){
         UserElement userElement = getUserElement(session);
-        ResponseBean  responseBean = tpTicketService.updateTicket(parameter,userElement.getId(),userElement.getCommunityId(),userElement.getUserName());
+        ResponseBean  responseBean = tpTicketService.updateTicket(parameter,userElement.getId(),userElement.getCommunityId(),userElement.getUserName(),userElement.getLoginName());
         return responseBean;
     }
 }

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

@@ -54,7 +54,7 @@ public interface TpTicketService extends IService<TpTicket> {
      * @param id
      * @return
      */
-    ResponseBean updateTicketStatus(String parameter, Integer id,Integer communityId,String userNmae );
+    ResponseBean updateTicketStatus(String parameter, Integer id,Integer communityId,String userNmae,String LoginName);
 
     /**
      * 修改当前状态为待评价
@@ -64,5 +64,5 @@ public interface TpTicketService extends IService<TpTicket> {
      * @param userName
      * @return
      */
-    ResponseBean updateTicket(String parameter, Integer id, Integer communityId, String userName);
+    ResponseBean updateTicket(String parameter, Integer id, Integer communityId, String userName,String longName);
 }

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

@@ -225,7 +225,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     }
 
     @Override
-    public ResponseBean updateTicketStatus(String parameter, Integer id,Integer communityId,String userName) {
+    public ResponseBean updateTicketStatus(String parameter, Integer id,Integer communityId,String userName,String LoginName) {
         /*拒绝处理仅在待分配的情况下修改，由前台控制拒绝处理的按钮是否显示*/
         ResponseBean response=  new ResponseBean();
         JSONObject object= JSONObject.parseObject(parameter);
@@ -237,10 +237,11 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicket.setUpdateUser(id);
         tpTicket.setUpdateDate(LocalDateTime.now());
         tpTicketMapper.updateById(tpTicket);
+        /*查询当前处理人的名字*/
 
         TpTicketRecord tpTicketRecord= new TpTicketRecord();
         tpTicketRecord.setTicketId(ticketId);
-        tpTicketRecord.setContent("拒绝处理");
+        tpTicketRecord.setContent("您的报修被物业人员"+userName+"拒绝接受理，原因:"+textContent+",有问题可以联系"+userName+":"+LoginName);
         tpTicketRecord.setCommunityId(communityId);
         tpTicketRecord.setStatus("1");
         tpTicketRecord.setCreateUser(id);
@@ -262,7 +263,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     }
 
     @Override
-    public ResponseBean updateTicket(String parameter, Integer id, Integer communityId, String userName) {
+    public ResponseBean updateTicket(String parameter, Integer id, Integer communityId, String userName,String longName) {
         ResponseBean response=new ResponseBean();
         JSONObject object= JSONObject.parseObject(parameter);
         String  content = object.getString("content");
@@ -278,6 +279,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicketRecord.setTicketId(ticketId);
        TpTicket tpTicketUserID= tpTicketMapper.selectById(ticketId);
         User userNameTpUserId= userMapper.selectById(tpTicketUserID.getTpUserId());
+        tpTicketRecord.setContent("物业工作人员"+userName+"已经处理结束联系方式"+longName+",如果没有问题请给好评");
         tpTicketRecord.setStatus("4");
         tpTicketRecord.setCreateUser(id);
         tpTicketRecord.setCreateDate(LocalDateTime.now());

VUECODE/smart-property-manage/src/views/ticket/details.vue

@@ -517,7 +517,7 @@ export default {
         background: 'rgba(0, 0, 0, 0.7)' 
         })
 
-        if(this.listQuery.relationContent===undefined){
+        if(this.listQuery.relationContent===undefined||this.listQuery.relationContent===''){
          this.$message.error('请填写内容')
          loading.close()
          return