调整

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

@@ -4,12 +4,14 @@ package com.huiju.estateagents.property.controller;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TpTicket;
 import com.huiju.estateagents.property.model.TpTicketRecordComment;
 import com.huiju.estateagents.property.service.IUserService;
 import com.huiju.estateagents.property.service.TpTicketService;
+import com.huiju.estateagents.service.ITaPersonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -36,6 +38,9 @@ public class TpTicketController extends BaseController {
     @Autowired
     private IUserService userService;
 
+    @Autowired
+    private ITaPersonService taPersonService;
+
     @Autowired
     private TpTicketService tpTicketService;
     // @ApiOperation(value = "工单列表", notes = "工单列表")
@@ -127,12 +132,9 @@ public class TpTicketController extends BaseController {
                                    @RequestParam(value = "pageSize", defaultValue = "3") Integer pageSize,
                                    HttpServletRequest request) {
         ResponseBean response = new ResponseBean();
-        
-        TaUser userElement = getTaUser(request);
-
         TpTicket tpTicket = new TpTicket();
         tpTicket.setOrgId(Integer.valueOf(orgId));
-        tpTicket.setTaUserId(userElement.getUserId());
+        tpTicket.setPersonId(getPersonId(request));
 
         response = tpTicketService.getList(tpTicket, pageNum, pageSize);
         return response;
@@ -172,12 +174,9 @@ public class TpTicketController extends BaseController {
                                        @RequestParam(value = "type") String type,
                                        HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-
-        TaUser userElement = getTaUser(request);
-
         TpTicket tpTicket = new TpTicket();
         tpTicket.setOrgId(Integer.valueOf(orgId));
-        tpTicket.setTaUserId(userElement.getUserId());
+        tpTicket.setPersonId(getPersonId(request));
         tpTicket.setType(type);
 
         responseBean = tpTicketService.getByTypeList(tpTicket, pageNum, pageSize);
@@ -192,12 +191,10 @@ public class TpTicketController extends BaseController {
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
     @RequestMapping(value = "/wx/ticket/reply/{orgId}", method = RequestMethod.POST)
     public ResponseBean updateTicketsReply(@PathVariable(value = "orgId") Integer orgId, @RequestBody TpTicketRecordComment tpTicketRecordComment, HttpServletRequest request){
-        TaUser userElement = getTaUser(request);
-        Integer userId = userElement.getUserId();
         ResponseBean responseBean = new ResponseBean();
 
         tpTicketRecordComment.setOrgId(orgId);
-        Integer size = tpTicketService.updateTicketsReply(tpTicketRecordComment, userId);
+        Integer size = tpTicketService.updateTicketsReply(tpTicketRecordComment, getPersonId(request));
         if (size > 0){
             responseBean.addSuccess(size);
         } else {
@@ -216,8 +213,7 @@ public class TpTicketController extends BaseController {
     @ResponseBody
     public ResponseBean addTransaction(@RequestBody String paramets, HttpServletRequest request) throws IOException {
         ResponseBean responseBean = new ResponseBean();
-        TaUser userElement = getTaUser(request);
-        ResponseBean response = tpTicketService.addAiTicketService(userElement, paramets);
+        ResponseBean response = tpTicketService.addAiTicketService(getPersonId(request), paramets);
         return response;
     }
 
@@ -232,8 +228,7 @@ public class TpTicketController extends BaseController {
                                             @RequestBody String parameter,
                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        TaUser userElement = getTaUser(request);
-        responseBean = tpTicketService.updateTicketContent(ticketId, parameter,userElement);
+        responseBean = tpTicketService.updateTicketContent(ticketId, parameter,getPersonId(request));
         return responseBean;
     }
 
@@ -243,10 +238,8 @@ public class TpTicketController extends BaseController {
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
     @RequestMapping(value = "/wx/stopTicket/{orgId}", method = RequestMethod.GET)
     public ResponseBean stopTicket(@PathVariable("orgId") Integer orgId, @RequestParam("ticketId") Integer ticketId, HttpServletRequest request) {
-        TaUser userElement = getTaUser(request);
-
         ResponseBean responseBean = new ResponseBean();
-        responseBean = tpTicketService.stopTpTicketRecord(orgId, ticketId, userElement);
+        responseBean = tpTicketService.stopTpTicketRecord(orgId, ticketId, getPersonId(request));
         return responseBean;
     }
 
@@ -257,8 +250,8 @@ public class TpTicketController extends BaseController {
 
     @RequestMapping(value = "/wx/addWxRecordComment", method = RequestMethod.POST)
     public ResponseBean addWxRecordComment(@RequestBody String parameter, HttpServletRequest request){
-        TaUser userElement = getTaUser(request);
-        ResponseBean  responseBean = tpTicketService.addWxRecordComment(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName());
+        TaPerson taPerson = taPersonService.getById(getPersonId(request));
+        ResponseBean  responseBean = tpTicketService.addWxRecordComment(parameter,taPerson.getPersonId(),1,taPerson.getName());
         return responseBean;
     }
 }

src/main/java/com/huiju/estateagents/property/model/Message.java

@@ -57,7 +57,7 @@ public class Message implements Serializable {
     /**
      * 接收人id
      */
-    private Integer uuid;
+    private String uuid;
 
     /**
      * 接收人id的类型  1是app用户 2是物业端用户
@@ -97,7 +97,7 @@ public class Message implements Serializable {
     /**
      * 创建人
      */
-    private Integer createUser;
+    private String createUser;
 
     /**
      * 创建时间

src/main/java/com/huiju/estateagents/property/model/TdImages.java

@@ -47,7 +47,7 @@ public class TdImages implements Serializable {
     /**
      * 创建人
      */
-    private Integer createUser;
+    private String createUser;
 
     /**
      * 创建时间

src/main/java/com/huiju/estateagents/property/model/TpTicket.java

@@ -41,7 +41,7 @@ public class TpTicket implements Serializable {
     /**
      * 住户app的id
      */
-    private Integer taUserId;
+    private String personId;
 
     /**
      * 工单标题
@@ -86,7 +86,7 @@ public class TpTicket implements Serializable {
     /**
      * 创建人
      */
-    private Integer createUser;
+    private String createUser;
 
     /**
      * 创建时间
@@ -96,7 +96,7 @@ public class TpTicket implements Serializable {
     /**
      * 更新人
      */
-    private Integer updateUser;
+    private String updateUser;
 
     /**
      * 用户姓名

src/main/java/com/huiju/estateagents/property/model/TpTicketRecord.java

@@ -54,7 +54,7 @@ public class TpTicketRecord implements Serializable {
     /**
      * 创建人
      */
-    private Integer createUser;
+    private String createUser;
 
     /**
      * 创建时间

src/main/java/com/huiju/estateagents/property/model/TpTicketRecordComment.java

@@ -49,7 +49,7 @@ public class TpTicketRecordComment implements Serializable {
     /**
      * 追问人id(tp_user_id也就是物业用户)   或者是 发起人id(ta_user_id也就是住户app的id)
      */
-    private Integer uuid;
+    private String uuid;
 
     /**
      * 用户类型： 0：追问人  1：发起人

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

@@ -100,11 +100,11 @@ public interface TpTicketService extends IService<TpTicket> {
 
     /**
      * 添加 维修/投诉/联系单
-     * @param userElement
+     * @param personId
      * @param parameter
      * @return
      */
-    ResponseBean addAiTicketService(TaUser userElement, String parameter) throws IOException;
+    ResponseBean addAiTicketService(String personId, String parameter) throws IOException;
 
     /**
      * 回复工单
@@ -112,15 +112,15 @@ public interface TpTicketService extends IService<TpTicket> {
      * @return
      */
     @Deprecated
-    Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment, Integer userId);
+    Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment, String personId);
 
     /**
      * 修改 维修/投诉/联系单 内容
      * @param ticketId
      * @param parameter
-     * @param userElement
+     * @param personId
      */
-    ResponseBean updateTicketContent(Integer ticketId, String parameter,TaUser userElement);
+    ResponseBean updateTicketContent(Integer ticketId, String parameter,String personId);
 
     /**
      * 终止 维修/投诉/联系单
@@ -128,15 +128,15 @@ public interface TpTicketService extends IService<TpTicket> {
      * @param ticketId
      * @return
      */
-    ResponseBean stopTpTicketRecord(Integer orgId, Integer ticketId, TaUser userElement);
+    ResponseBean stopTpTicketRecord(Integer orgId, Integer ticketId, String personId);
 
     /**
      * 添加工单对话
      * @param parameter
-     * @param verifyId
+     * @param personId
      * @param orgId
      * @param userName
      * @return
      */
-    ResponseBean addWxRecordComment(String parameter, Integer verifyId, Integer orgId, String userName);
+    ResponseBean addWxRecordComment(String parameter, String personId, Integer orgId, String userName);
 }

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

@@ -360,14 +360,14 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
             messageModelAPP.setMessageType("7");
             messageModelAPP.setAdviceType("1");
             messageModelAPP.setModelType("2");
-            messageModelAPP.setUuid(e.getTaUserId());
+            messageModelAPP.setUuid(e.getTaUserId().toString());
             messageModelAPP.setUuidType("1");
             // 消息是物业端 发过来的, 就是 2
             messageModelAPP.setSource("2");
             messageModelAPP.setMessageContent("您有待缴费的账单，点击查看并缴费 " + dateFormat.format(new Date()) + bill.getBillName());
             messageModelAPP.setStatus("1");
             messageModelAPP.setCreateDate(LocalDateTime.now());
-            messageModelAPP.setCreateUser(userElement.getUserId());
+            messageModelAPP.setCreateUser(userElement.getUserId().toString());
             messageModelAPP.setBillId(e.getId());
 
             return messageModelAPP;

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

@@ -298,14 +298,14 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 message.setMessageType("7");
                 message.setAdviceType("4");
                 message.setModelType("2");
-                message.setUuid(userElement.getUserId());
+                message.setUuid(userElement.getUserId().toString());
                 message.setUuidType("2");
                 // 消息是物业端发过来的, 就是 2
                 message.setSource("2");
                 message.setMessageContent("收费组“" + bill.getBillName() +  "”还未发布，点击发布");
                 message.setStatus("1");
                 message.setCreateDate(LocalDateTime.now());
-                message.setCreateUser(userElement.getUserId());
+                message.setCreateUser(userElement.getUserId().toString());
                 message.setBillId(bill.getId());
 
                 messageMapper.insert(message);
@@ -326,7 +326,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 messageModel.setMessageType("7");
                 messageModel.setAdviceType("4");
                 messageModel.setModelType("1");
-                messageModel.setUuid(userElement.getUserId());
+                messageModel.setUuid(userElement.getUserId().toString());
                 messageModel.setUuidType("2");
                 // 消息是物业端发过来的, 就是 2
                 messageModel.setSource("2");
@@ -334,7 +334,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 //                messageModel.setMessageContent("收费组“" + bill.getBillName() + "”还有" + DateUtils.getDaysBetween(new Date(), bill.getEndDate()) + "天就到截止日期了，但还有未缴用户，点击去查看");
                 messageModel.setStatus("1");
                 messageModel.setCreateDate(LocalDateTime.now());
-                messageModel.setCreateUser(userElement.getUserId());
+                messageModel.setCreateUser(userElement.getUserId().toString());
                 messageModel.setBillId(bill.getId());
 
                 messageMapper.insert(messageModel);
@@ -377,14 +377,14 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                         messageModelAPP.setMessageType("7");
                         messageModelAPP.setAdviceType("1");
                         messageModelAPP.setModelType("2");
-                        messageModelAPP.setUuid(e.getTaUserId());
+                        messageModelAPP.setUuid(e.getTaUserId().toString());
                         messageModelAPP.setUuidType("1");
                         // 消息是物业端 发过来的, 就是 2
                         messageModelAPP.setSource("2");
                         messageModelAPP.setMessageContent("您有待缴费的账单，点击查看并缴费 " + dateFormat.format(new Date()) + bill.getBillName());
                         messageModelAPP.setStatus("1");
                         messageModelAPP.setCreateDate(LocalDateTime.now());
-                        messageModelAPP.setCreateUser(userElement.getUserId());
+                        messageModelAPP.setCreateUser(userElement.getUserId().toString());
                         messageModelAPP.setBillId(e.getId());
 
                         return messageModelAPP;

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

@@ -302,7 +302,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             message.setMessageType("9");
             message.setAdviceType("1");
             message.setModelType("1");
-            message.setUuid(taUserVerify.getId());
+            message.setUuid(taUserVerify.getId().toString());
             message.setUuidType("1");
             message.setSource("1");
             message.setMessageContent(count);
@@ -310,7 +310,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             message.setResult("");
             message.setMeaasgeTypeId("");
             message.setReadStatus("0");
-            message.setCreateUser(userElement.getUserId());
+            message.setCreateUser(userElement.getUserId().toString());
             message.setCreateDate(LocalDateTime.now());
             messageMapper.insert(message);
         }

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

@@ -133,7 +133,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             message.setMessageType("9");
             message.setAdviceType("1");
             message.setModelType("1");
-            message.setUuid(userVerify.getId());
+            message.setUuid(userVerify.getId().toString());
             message.setUuidType("1");
             message.setSource("1");
             message.setMessageContent(count);
@@ -141,7 +141,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             message.setResult("");
             message.setMeaasgeTypeId("");
             message.setReadStatus("0");
-            message.setCreateUser(userElement.getUserId());
+            message.setCreateUser(userElement.getUserId().toString());
             message.setCreateDate(LocalDateTime.now());
             tpmessageMapper.insert(message);
         }
@@ -271,7 +271,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             message.setMessageType("9");
             message.setAdviceType("1");
             message.setModelType("1");
-            message.setUuid(userVerify.getId());
+            message.setUuid(userVerify.getId().toString());
             message.setUuidType("1");
             message.setSource("1");
             message.setMessageContent(count);
@@ -279,7 +279,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             message.setResult("");
             message.setMeaasgeTypeId("");
             message.setReadStatus("0");
-            message.setCreateUser(userElement.getUserId());
+            message.setCreateUser(userElement.getUserId().toString());
             message.setCreateDate(LocalDateTime.now());
             tpmessageMapper.insert(message);
         }

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

@@ -185,14 +185,14 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
             activityMessage.setMessageType("8");
             activityMessage.setAdviceType("4");
             activityMessage.setModelType("2");
-            activityMessage.setUuid(userElement.getUserId());
+            activityMessage.setUuid(userElement.getUserId().toString());
             activityMessage.setUuidType("2");
             activityMessage.setSource("2");
             activityMessage.setMessageContent("活动“{" + tpActivity.getActivityTitle() + "}”还未发布，点击发布");
             activityMessage.setStatus("1");
             activityMessage.setActivityId(tpActivity.getId());
             activityMessage.setCreateDate(LocalDateTime.now());
-            activityMessage.setCreateUser(userElement.getUserId());
+            activityMessage.setCreateUser(userElement.getUserId().toString());
             activityMessage.setReadStatus("0");
                 //为草稿时
                 if ("2".equals(tpActivity.getStatus())) {
@@ -242,7 +242,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
                         tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId());
                         tdImages.setUuid(tpActivity.getId());
                         tdImages.setType("activityCode");
-                        tdImages.setCreateUser(userElement.getUserId());
+                        tdImages.setCreateUser(userElement.getUserId().toString());
                         tdImages.setCreateTime(LocalDateTime.now());
                         tdImagesMapper.insert(tdImages);
 
@@ -268,7 +268,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
         for (String img : contentImgArray) {
             TdImages tdImages = new TdImages();
             tdImages.setCreateTime(LocalDateTime.now());
-            tdImages.setCreateUser(userElement.getUserId());
+            tdImages.setCreateUser(userElement.getUserId().toString());
             tdImages.setImageUrl(img);
             tdImages.setType("activity");
             tdImages.setUuid(tpActivity.getId());
@@ -308,7 +308,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
             tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId());
             tdImages.setUuid(tpActivity.getId());
             tdImages.setType("activityCode");
-            tdImages.setCreateUser(userElement.getUserId());
+            tdImages.setCreateUser(userElement.getUserId().toString());
             tdImages.setCreateTime(LocalDateTime.now());
             tdImagesMapper.insert(tdImages);
         }

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

@@ -121,13 +121,13 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             message.setMessageType("5");
             message.setModelType("2");
             message.setAdviceType("4");
-            message.setUuid(userId);
+            message.setUuid(userId.toString());
             message.setUuidType("2");
             message.setSource("2");
             message.setMessageContent("公告“" + tpAnnouncement.getAnnouncementTitle() + "”还未发布，查看详情");
             message.setStatus("1");
             message.setReadStatus("0");
-            message.setCreateUser(userId);
+            message.setCreateUser(userId.toString());
             message.setCreateDate(LocalDateTime.now());
             message.setAnnouncementId(tpAnnouncement.getId());
             //为草稿的时
@@ -155,7 +155,7 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             tdImages.setType("announcement");
             tdImages.setUuid(tpAnnouncement.getId());
             tdImages.setCreateTime(LocalDateTime.now());
-            tdImages.setCreateUser(userId);
+            tdImages.setCreateUser(userId.toString());
             imagesMapper.insert(tdImages);
         }
             return response;
@@ -216,7 +216,7 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
                 tdImages.setType("announcement");
                 tdImages.setUuid(tpAnnouncement.getId());
                 tdImages.setCreateTime(LocalDateTime.now());
-                tdImages.setCreateUser(userId);
+                tdImages.setCreateUser(userId.toString());
                 imagesMapper.insert(tdImages);
             }
         }

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

@@ -10,6 +10,8 @@ import com.google.common.collect.Maps;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.model.*;
@@ -40,9 +42,6 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     @Autowired
     private  TpTicketMapper tpTicketMapper;
 
-//    @Autowired
-//    private UserMapper userMapper;
-
     @Autowired
     private TaUserMapper taUserMapper;
 
@@ -61,6 +60,9 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
 
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+
     @Override
     public ResponseBean ticketLiset(String parameter,Integer orgId) {
          ResponseBean response= new ResponseBean<>();
@@ -115,17 +117,17 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         TpTicketVO ticketVO= tpTicketMapper.ticketDetails(ticketId);
         // 从taUserVerify里面获取userID
         TaUserVerify taUserVerify= taUserVerifyMapper.selectById(ticketVO.getCreateUser());
-//        TaUser taUser= taUserMapper.selectById(taUserVerify.getUserId());
+        TaPerson taPerson = taPersonMapper.selectById(ticketVO.getPersonId());
         /*发起人*/
-//        ticketVO.setCreateUserNmae(taUser.getUserName());
+        ticketVO.setCreateUserNmae(taPerson.getName());
         /*发起人手机号码*/
-//        ticketVO.setLoginName(taUser.getLoginName());
+        ticketVO.setLoginName(taPerson.getPhone());
         /*查询当前受理人*/
-//        ticketVO.setTpUserNmae(userMapper.selectByIdUserName(ticketVO.getTpUserId()));
         TaUser taUser = taUserMapper.selectById(ticketVO.getTpUserId());
-        if (null != taUser) {
+        if (null != taUser){
             ticketVO.setTpUserNmae(taUser.getUserName());
         }
+
         /*所有物业端本小区的人员*/
 //        ticketVO.setTpUsersList(userMapper.getUser( userID,orgId));
         /*本人*/
@@ -177,7 +179,6 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         return response;
     }
 
-    @Override
     public ResponseBean addRecordComment(String parameter, Integer id,Integer orgId,String userName) {
         ResponseBean response=new ResponseBean();
         JSONObject object= JSONObject.parseObject(parameter);
@@ -194,7 +195,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicketRecordComment.setContent(content);
         tpTicketRecordComment.setTicketId(ticketId);
         tpTicketRecordComment.setTicketRecordId(ticketRecord.getId());
-        tpTicketRecordComment.setUuid(id);
+        tpTicketRecordComment.setUuid(id.toString());
         tpTicketRecordComment.setUserType("0");
         tpTicketRecordComment.setUserName(userName);
         tpTicketRecordComment.setCreateDate(LocalDateTime.now());
@@ -210,7 +211,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
                 tdImages.setType("reply");
                 tdImages.setUuid(tpTicketRecordComment.getId());
                 tdImages.setCreateTime(LocalDateTime.now());
-                tdImages.setCreateUser(id);
+                tdImages.setCreateUser(id.toString());
                 tdImagesMapper.insert(tdImages);
             }
         }
@@ -260,7 +261,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 //        tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + userName.getUserName()+",联系方式:" + userName.getLoginName());
         tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + taUser.getUserName()+",联系方式:" + taUser.getPhone());
         tpTicketRecord.setStatus("3");
-        tpTicketRecord.setCreateUser(user);
+        tpTicketRecord.setCreateUser(user.toString());
         tpTicketRecord.setCreateDate(LocalDateTime.now());
         tpTicketRecordMapper.insert(tpTicketRecord);
 
@@ -274,14 +275,14 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         message.setMessageType(ticket.getType());
         message.setTicketId(ticket.getId());
         message.setAdviceType("4");
-        message.setUuid(userID);
+        message.setUuid(userID.toString());
         message.setModelType("2");
         message.setUuidType("2");
         message.setSource("2");
         message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给您，点击查看并处理");
         message.setStatus("1");
         message.setReadStatus("0");
-        message.setCreateUser(user);
+        message.setCreateUser(user.toString());
         message.setCreateDate(LocalDateTime.now());
         message.setTicketId(ticketId);
         messageMapper.insert(message);
@@ -310,7 +311,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         TpTicket tpTicket= new TpTicket();
         tpTicket.setId(ticketId);
         tpTicket.setStatus("1");
-        tpTicket.setUpdateUser(id);
+        tpTicket.setUpdateUser(id.toString());
         tpTicket.setUpdateDate(LocalDateTime.now());
         tpTicketMapper.updateById(tpTicket);
         /*查询当前处理人的名字*/
@@ -320,7 +321,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicketRecord.setContent("您的报修被物业人员"+userName+"拒绝接受理，原因:"+textContent+",有问题可以联系"+userName+":联系方式:"+LoginName);
         tpTicketRecord.setOrgId(orgId);
         tpTicketRecord.setStatus("1");
-        tpTicketRecord.setCreateUser(id);
+        tpTicketRecord.setCreateUser(id.toString());
         tpTicketRecord.setCreateDate(LocalDateTime.now());
         tpTicketRecordMapper.insert(tpTicketRecord);
         /*把内容添加到对话中*/
@@ -328,7 +329,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         ticketRecordComment.setOrgId(orgId);
         ticketRecordComment.setTicketId(ticketId);
         ticketRecordComment.setTicketRecordId(tpTicketRecord.getId());
-        ticketRecordComment.setUuid(id);
+        ticketRecordComment.setUuid(id.toString());
         ticketRecordComment.setUserType("0");
         ticketRecordComment.setContent("拒绝受理，原因——"+textContent);
         ticketRecordComment.setUserName(userName);
@@ -358,7 +359,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         message.setMessageContent("您的工单“" + ticket.getTicketTitle() + "”已被拒绝受理");
         message.setStatus("1");
         message.setReadStatus("0");
-        message.setCreateUser(id);
+        message.setCreateUser(id.toString());
         message.setCreateDate(LocalDateTime.now());
         message.setTicketId(ticketId);
         messageMapper.insert(message);
@@ -386,7 +387,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 //        TaUser taUser = taUserMapper.selectById(tpTicketUserID.getTaUserId());
         tpTicketRecord.setContent("物业工作人员"+userName+"已经处理结束,如果没有问题请给好评,联系方式:"+longName);
         tpTicketRecord.setStatus("4");
-        tpTicketRecord.setCreateUser(id);
+        tpTicketRecord.setCreateUser(id.toString());
         tpTicketRecord.setCreateDate(LocalDateTime.now());
         tpTicketRecordMapper.insert(tpTicketRecord);
         /*维护对话*/
@@ -394,7 +395,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicketRecordComment.setOrgId(orgId);
         tpTicketRecordComment.setTicketId(ticketId);
         tpTicketRecordComment.setTicketRecordId(tpTicketRecord.getId());
-        tpTicketRecordComment.setUuid(id);
+        tpTicketRecordComment.setUuid(id.toString());
         tpTicketRecordComment.setUserType("0");
         tpTicketRecordComment.setContent("处理结果如下____"+content);
         tpTicketRecordComment.setUserName(userName);
@@ -411,7 +412,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
                 tdImages.setType(Constant.REPLY);
                 tdImages.setUuid(tpTicketRecordComment.getId());
                 tdImages.setCreateTime(LocalDateTime.now());
-                tdImages.setCreateUser(id);
+                tdImages.setCreateUser(id.toString());
                 tdImagesMapper.insert(tdImages);
             }
         }
@@ -428,14 +429,14 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         message.setMessageType(ticket.getType());
         message.setTicketId(ticket.getId());
         message.setAdviceType("1");
-        message.setUuid(ticket.getCreateUser());
+        message.setUuid(ticket.getPersonId());
         message.setModelType("1");
         message.setUuidType("1");
         message.setSource("2");
         message.setMessageContent("您的工单“" + ticket.getTicketTitle() + "”已处理完成，请查看详情");
         message.setStatus("1");
         message.setReadStatus("0");
-        message.setCreateUser(id);
+        message.setCreateUser(id.toString());
         message.setCreateDate(LocalDateTime.now());
         message.setTicketId(ticketId);
         messageMapper.insert(message);
@@ -453,7 +454,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
         Map<String, Object> parameter = Maps.newHashMap();
         parameter.put("orgId", tpTicket.getOrgId());
-        parameter.put("taUserId", tpTicket.getTaUserId());
+        parameter.put("personId", tpTicket.getPersonId());
 
         //  1：投诉   2：报修 3：联系物业
         parameter.put("type", 2);
@@ -567,7 +568,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
         Map<String, Object> parameter = Maps.newHashMap();
         parameter.put("orgId", tpTicket.getOrgId());
-        parameter.put("taUserId", tpTicket.getTaUserId());
+        parameter.put("taUserId", tpTicket.getPersonId());
 
         //  1：投诉   2：报修 3：联系物业
         parameter.put("type", tpTicket.getType());
@@ -649,7 +650,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean addAiTicketService(TaUser userElement, String parameter) throws IOException {
+    public ResponseBean addAiTicketService(String personId, String parameter) throws IOException {
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         String imageUrl = (String) jsonObject.get("imageUrl");
@@ -662,37 +663,37 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
          * 依次插入相关数据, 该工单默认的第一条数据(待分配), 是工单标题,
          */
 
-        tpTicket.setOrgId(userElement.getOrgId());
+        tpTicket.setOrgId(1);
         // 2.1以后为ta_user_verify为中心不再是已用户ta_user为中心
-        tpTicket.setTaUserId(userElement.getUserId());
+        tpTicket.setPersonId(personId);
         // 默认待分配
         tpTicket.setStatus("0");
         // 2.1以后为ta_user_verify为中心不再是已用户ta_user为中心
-        tpTicket.setCreateUser(userElement.getUserId());
+        tpTicket.setCreateUser(personId);
         tpTicket.setCreateDate(LocalDateTime.now());
-        tpTicket.setUpdateUser(userElement.getUserId());
+        tpTicket.setUpdateUser(personId);
         //tpTicket.setUpdateDate(new Date());
         //校验此工单是否已存在
-        TpTicket tpTicketName= tpTicketMapper.selectTpTicketName(userElement.getOrgId(),tpTicket.getType(),tpTicket.getTicketTitle());
+        TpTicket tpTicketName= tpTicketMapper.selectTpTicketName(1,tpTicket.getType(),tpTicket.getTicketTitle());
         if (null != tpTicketName){
             response.addError("工单已存在");
             return  response;
         }
         // 插入工单
         tpTicketMapper.insert(tpTicket);
-        insertTdImage(tpTicket, imageUrl, userElement.getUserId());
+        insertTdImage(tpTicket, imageUrl, personId);
 
         Integer id = tpTicket.getId();
         TpTicketRecord tpTicketRecord = new TpTicketRecord();
         //获取当前插入的信息，维护工单记录表
         TpTicket tpTicketReco = tpTicketMapper.selectById(id);
-        tpTicketRecord.setOrgId(userElement.getOrgId());
+        tpTicketRecord.setOrgId(1);
         tpTicketRecord.setTicketId(tpTicketReco.getId());
         // 1：投诉   2：报修 3：联系物业
         String typeName = "2".equals(tpTicket.getType()) ? "报修" : "1".equals(tpTicket.getType()) ? "投诉" : "3".equals(tpTicket.getType()) ? "联系工单" : "未知类型";
         tpTicketRecord.setContent("您的" + typeName + "正在分配物业处理人员, 若长时间无人处理, 请联系物业! 联系物业号码簿 >");
         tpTicketRecord.setStatus(tpTicketReco.getStatus());
-        tpTicketRecord.setCreateUser(userElement.getUserId());
+        tpTicketRecord.setCreateUser(personId);
         tpTicketRecord.setCreateDate(LocalDateTime.now());
         // 插入工单处理表
         tpTicketRecordMapper.insert(tpTicketRecord);
@@ -719,10 +720,10 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
      *
      * @param tpTicket
      * @param imageUrl
-     * @param userId
+     * @param pesonId
      * @throws IOException
      */
-    private void insertTdImage(TpTicket tpTicket, String imageUrl, Integer userId) {
+    private void insertTdImage(TpTicket tpTicket, String imageUrl, String pesonId) {
         if (null == imageUrl || "".equals(imageUrl)) {
             return;
         }
@@ -733,7 +734,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
             tdImages.setImageUrl(img);
             tdImages.setType(Constant.SERVICE);
             tdImages.setUuid(uuId);
-            tdImages.setCreateUser(userId);
+            tdImages.setCreateUser(pesonId);
             tdImages.setCreateTime(LocalDateTime.now());
             tdImagesMapper.insert(tdImages);
         }
@@ -748,17 +749,17 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
      * @return
      */
     @Override
-    public Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment, Integer userId) {
+    public Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment, String personId) {
         //查询用户名
 //        User taUser = userMapper.selectById(userId);
-        TaUser taUser = taUserMapper.selectById(userId);
+        TaPerson  taPerson = taPersonMapper.selectById(personId);
 
         TpTicket  tpTicket= tpTicketMapper.selectById(tpTicketRecordComment.getTicketId());
         TpTicketRecord ticketRecord= tpTicketRecordMapper.selectTpTicketRecord(tpTicketRecordComment.getTicketId(), Integer.valueOf(tpTicket.getStatus()));
 
-        tpTicketRecordComment.setUserName(taUser.getUserName());
+        tpTicketRecordComment.setUserName(taPerson.getName());
         tpTicketRecordComment.setParentId(tpTicketRecordComment.getId());
-        tpTicketRecordComment.setUuid(userId);
+        tpTicketRecordComment.setUuid(personId);
         tpTicketRecordComment.setTicketRecordId(ticketRecord.getId());
         tpTicketRecordComment.setUserType(Constant.TICKET_USER_TYPE);
         tpTicketRecordComment.setCreateDate(LocalDateTime.now());
@@ -769,7 +770,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean updateTicketContent(Integer ticketId, String parameter, TaUser userElement) {
+    public ResponseBean updateTicketContent(Integer ticketId, String parameter, String personId) {
         ResponseBean responseBean = new ResponseBean();
 
         JSONObject jsonObject = JSONObject.parseObject(parameter);
@@ -785,7 +786,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         map.put("type", "service");
         tdImagesMapper.deleteByUuidAndType(map);
 
-        insertTdImage(tpTicket, imageUrl, userElement.getUserId());
+        insertTdImage(tpTicket, imageUrl, personId);
 
         TpTicket ticket = tpTicketMapper.selectById(ticketId);
         ticket.setTicketTitle(tpTicket.getTicketTitle());
@@ -820,7 +821,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseBean stopTpTicketRecord(Integer orgId, Integer ticketId, TaUser userElement) {
+    public ResponseBean stopTpTicketRecord(Integer orgId, Integer ticketId, String personId) {
         ResponseBean responseBean = new ResponseBean();
         try {
             TpTicket tpTicket = new TpTicket();
@@ -836,21 +837,20 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
             tpTicketRecord.setOrgId(orgId);
 
             tpTicketRecord.setContent("您的联系单已被您自己终止，如果仍有问题，可以在服务页新增一个报修/投诉/联系单");
-            tpTicketRecord.setCreateUser(userElement.getUserId());
+            tpTicketRecord.setCreateUser(personId);
             tpTicketRecord.setCreateDate(LocalDateTime.now());
             tpTicketRecordMapper.insert(tpTicketRecord);
             // 终止后维护tp_ticket_record_comment对话
-            Integer createUser= tpTicketMapper.selectById(ticketId).getCreateUser();
-            TaUserVerify taUserVerify= taUserVerifyMapper.selectById(createUser);
+            String createUser= tpTicketMapper.selectById(ticketId).getCreateUser();
+//            TaUserVerify taUserVerify= taUserVerifyMapper.selectById(createUser);
 
 //            User taUser= userMapper.selectById(taUserVerify.getPersonId());
-            TaUser taUser = taUserMapper.selectById(taUserVerify.getPersonId());
+            TaUser taUser = taUserMapper.selectById(createUser);
             TpTicketRecordComment tpTicketRecordComment = new TpTicketRecordComment();
             tpTicketRecordComment.setOrgId(orgId);
             tpTicketRecordComment.setTicketId(ticketId);
             tpTicketRecordComment.setTicketRecordId(tpTicketRecord.getId());
-            tpTicketRecordComment.setUuid(userElement.getUserId());
-            tpTicketRecordComment.setUuid(taUserVerify.getId());
+            tpTicketRecordComment.setUuid(personId);
             tpTicketRecordComment.setUserName(taUser.getUserName());
             tpTicketRecordComment.setContent("业主终止工单，原因——无");
             tpTicketRecordComment.setCreateDate(LocalDateTime.now());
@@ -894,7 +894,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpMessage.setAdviceType("1");
         // 模板类型为 消息模板
         tpMessage.setModelType("1");
-        tpMessage.setUuid(userId);
+        tpMessage.setUuid(userId.toString());
         // 接收人类型: APP用户
         tpMessage.setUuidType("1");
         // 来源: APP 端用户
@@ -904,7 +904,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpMessage.setStatus("1");
         // 阅读状态: 0未阅读
         tpMessage.setReadStatus("0");
-        tpMessage.setCreateUser(userId);
+        tpMessage.setCreateUser(userId.toString());
         tpMessage.setCreateDate(LocalDateTime.now());
         tpMessage.setUpdateUser(userId);
         tpMessage.setUpdateDate(LocalDateTime.now());
@@ -915,7 +915,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
     }
     @Override
-    public ResponseBean addWxRecordComment(String parameter, Integer verifyId,Integer orgId,String userName) {
+    public ResponseBean addWxRecordComment(String parameter, String verifyId,Integer orgId,String userName) {
         ResponseBean response=new ResponseBean();
         JSONObject object= JSONObject.parseObject(parameter);
 

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

@@ -191,7 +191,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 			tdImages.setType("transaction");
 			tdImages.setUuid(tpTransaction.getId());
 			tdImages.setCreateTime(LocalDateTime.now());
-			tdImages.setCreateUser(id);
+			tdImages.setCreateUser(id.toString());
 			tdImagesMapper.insert(tdImages);
 		}
 		return response;
@@ -232,7 +232,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 			tdImages.setType("transaction");
 			tdImages.setUuid(tpTransaction.getId());
 			tdImages.setCreateTime(LocalDateTime.now());
-			tdImages.setCreateUser(id);
+			tdImages.setCreateUser(id.toString());
 			tdImagesMapper.insert(tdImages);
 		}
 		return response;
@@ -389,7 +389,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 			tdImages.setType("reply");
 			tdImages.setUuid(transactionReply.getId());
 			tdImages.setCreateTime(LocalDateTime.now());
-			tdImages.setCreateUser(userElement.getUserId());
+			tdImages.setCreateUser(userElement.getUserId().toString());
 			tdImagesMapper.insert(tdImages);
 		}
 		response.addSuccess("成功");

src/main/resources/mapper/property/TpTicketMapper.xml

@@ -5,7 +5,7 @@
     SELECT
     p.id,
     p.org_id,
-    p.ta_user_id,
+    p.person_id,
     p.ticket_title,
     p.ticket_content,
     p.STATUS,
@@ -18,10 +18,10 @@
     p.create_date,
     p.update_user,
     p.update_date,
-    us.user_name
+        us.name as user_name
     FROM
     tp_ticket p
-    LEFT JOIN ta_user AS us ON p.create_user=us.user_id
+    LEFT JOIN ta_person AS us ON p.create_user=us.person_id
 <where>
     <if test="ticket.id != null and ticket.id !=''">
         and  p.id like concat('%',#{ticket.id,jdbcType=INTEGER},'%')
@@ -33,13 +33,13 @@
         and p.ticket_title like concat('%',#{ticket.ticketTitle,jdbcType=VARCHAR},'%')
     </if>
     <if test="userName != null and userName !=''">
-        and AS.user_name like concat('%',#{ userName,jdbcType=VARCHAR},'%')
+        and us.name like concat('%',#{ userName,jdbcType=VARCHAR},'%')
     </if>
     <if test="ticket.status != null and ticket.status !=''">
         and  p.status=#{ticket.status,jdbcType=INTEGER}
     </if>
     <if test="updateUserNmae != null and updateUserNmae !=''">
-        and us.user_name like concat('%',#{ updateUserNmae,jdbcType=VARCHAR},'%')
+        and us.name like concat('%',#{ updateUserNmae,jdbcType=VARCHAR},'%')
     </if>
     and p.org_id=#{orgId,jdbcType=INTEGER}
 </where>
@@ -50,7 +50,7 @@
         SELECT
         p.id,
         p.org_id,
-        p.ta_user_id,
+        p.person_id,
         p.ticket_title,
         p.ticket_content,
         p.STATUS,