feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.46</version>
+	<version>1.0.47</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/property/controller/TpTicketController.java

@@ -153,7 +153,7 @@ public class TpTicketController extends BaseController {
     @RequestMapping(value = "/admin/updateTicketStatus", method = RequestMethod.POST)
     public ResponseBean updateTicketStatus(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
-        ResponseBean  responseBean = tpTicketService.updateTicketStatus(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName(),userElement.getLoginName());
+        ResponseBean  responseBean = tpTicketService.updateTicketStatus(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName(),userElement.getPhone());
         return responseBean;
     }
 
@@ -165,7 +165,7 @@ public class TpTicketController extends BaseController {
     @RequestMapping(value = "/admin/updateTicket", method = RequestMethod.POST)
     public ResponseBean updateTicket(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
-        ResponseBean  responseBean = tpTicketService.updateTicket(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName(),userElement.getLoginName());
+        ResponseBean  responseBean = tpTicketService.updateTicket(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName(),userElement.getPhone());
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/property/service/TpTicketService.java

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

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -298,7 +298,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         TpTicketRecord tpTicketRecord= new TpTicketRecord();
         tpTicketRecord.setOrgId(orgId);
         tpTicketRecord.setTicketId(ticketId);
-        tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + taUser.getUserName()+",联系方式:" + taUser.getLoginName());
+        tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + taUser.getUserName()+",联系方式:" + taUser.getPhone());
         tpTicketRecord.setStatus("3");
         tpTicketRecord.setCreateUser(user.toString());
         tpTicketRecord.setCreateDate(LocalDateTime.now());
@@ -362,7 +362,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         TpTicketRecord tpTicketRecord= new TpTicketRecord();
         tpTicketRecord.setOrgId(orgId);
         tpTicketRecord.setTicketId(ticketId);
-//        tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + userName.getUserName()+",联系方式:" + userName.getLoginName());
+//        tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + userName.getUserName()+",联系方式:" + userName.getPhone());
         tpTicketRecord.setContent("您的联系单已经分配给维修人员" + taUser.getUserName()+",联系方式:" + taUser.getPhone());
         tpTicketRecord.setStatus("3");
         tpTicketRecord.setCreateUser(user.toString());
@@ -412,7 +412,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     }
 
     @Override
-    public ResponseBean updateTicketStatus(String parameter, Integer id,Integer orgId,String userName,String LoginName) {
+    public ResponseBean updateTicketStatus(String parameter, Integer id,Integer orgId,String userName,String phone) {
         /*拒绝处理仅在待分配的情况下修改，由前台控制拒绝处理的按钮是否显示*/
         ResponseBean response=  new ResponseBean();
         JSONObject object= JSONObject.parseObject(parameter);
@@ -428,7 +428,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
         TpTicketRecord tpTicketRecord= new TpTicketRecord();
         tpTicketRecord.setTicketId(ticketId);
-        tpTicketRecord.setContent("您的报修被物业人员"+userName+"拒绝接受理，原因:"+textContent+",有问题可以联系"+userName+":联系方式:"+LoginName);
+        tpTicketRecord.setContent("您的报修被物业人员"+userName+"拒绝接受理，原因:"+textContent+",有问题可以联系"+userName+":联系方式:"+phone);
         tpTicketRecord.setOrgId(orgId);
         tpTicketRecord.setStatus("1");
         tpTicketRecord.setCreateUser(id.toString());
@@ -478,7 +478,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     }
 
     @Override
-    public ResponseBean updateTicket(String parameter, Integer id, Integer orgId, String userName,String longName) {
+    public ResponseBean updateTicket(String parameter, Integer id, Integer orgId, String userName,String phone) {
         ResponseBean response=new ResponseBean();
         JSONObject object= JSONObject.parseObject(parameter);
         String  content = object.getString("content");
@@ -495,7 +495,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
        TpTicket tpTicketUserID= tpTicketMapper.selectById(ticketId);
 //        User userNameTpUserId= userMapper.selectById(tpTicketUserID.getTpUserId());
 //        TaUser taUser = taUserMapper.selectById(tpTicketUserID.getTaUserId());
-        tpTicketRecord.setContent("物业工作人员"+userName+"已经处理结束,如果没有问题请给好评,联系方式:"+longName);
+        tpTicketRecord.setContent("物业工作人员"+userName+"已经处理结束,如果没有问题请给好评,联系方式:"+phone);
         tpTicketRecord.setStatus("4");
         tpTicketRecord.setCreateUser(id.toString());
         tpTicketRecord.setCreateDate(LocalDateTime.now());