调整

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

@@ -110,17 +110,17 @@ public class TpTicketController extends BaseController {
         return responseBean;
     }
 
-//    @ApiOperation(value = "工单分配", notes = "工单分配")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "ticketId:工单编号，id：选中的分配人员的id")
-//    })
-//    @RequestMapping(value = "/wx/addRecord", method = RequestMethod.POST)
-//    public ResponseBean wxAddRecord(@RequestBody String parameter, HttpServletRequest request){
-//        TaUser taUser = getPropUserByPersonId(getPersonId(request));
-//
-//        ResponseBean  responseBean = tpTicketService.addRecord(parameter,taUser.getUserId(),getOrgId(request));
-//        return responseBean;
-//    }
+    @ApiOperation(value = "生活管家给维修工分配工单", notes = "生活管家给维修工分配工单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "ticketId:工单编号，id：选中的分配人员的id")
+    })
+    @RequestMapping(value = "/wx/addRecord", method = RequestMethod.POST)
+    public ResponseBean wxAddRecord(@RequestBody String parameter, HttpServletRequest request){
+        TaUser taUser = getPropUserByPersonId(getPersonId(request));
+
+        ResponseBean  responseBean = tpTicketService.addRecord(parameter,taUser.getUserId(),getOrgId(request));
+        return responseBean;
+    }
 
     private TaUser getPropUserByPersonId(String personId) {
         TaPerson person = taPersonService.getById(personId);

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

@@ -108,6 +108,16 @@ public class TpTicket implements Serializable {
      */
     private Integer billInvoiceId;
 
+    /**
+     * 维修工人id
+     */
+    private Integer workerId;
+
+    /**
+     * 维修工人姓名
+     */
+    private String workerName;
+
     /**
      * 用户姓名
      */

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

@@ -147,7 +147,10 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         QueryWrapper<TaUser> taUserQueryWrapper =new QueryWrapper<>();
         taUserQueryWrapper.eq("org_id",orgId);
 //        taUserQueryWrapper.ne("user_id",userID);
-        taUserQueryWrapper.eq("type","life-consultant");
+        List<String> typeList = new ArrayList<>();
+        typeList.add("life-consultant");
+        typeList.add("worker");
+        taUserQueryWrapper.in("type",typeList);
         ticketVO.setTpUsersList(taUserMapper.selectList(taUserQueryWrapper));
         /*本人*/
         if (null != userID){
@@ -284,8 +287,8 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
         TpTicket tpTicket= new TpTicket();
         tpTicket.setId(ticketId);
-        tpTicket.setStatus("3");
-        tpTicket.setTpUserId(userID);
+        tpTicket.setWorkerId(userID);
+        tpTicket.setWorkerName(taUser.getUserName());
         tpTicket.setUpdateDate(LocalDateTime.now());
         tpTicketMapper.updateById(tpTicket);
 
@@ -293,7 +296,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicketRecord.setOrgId(orgId);
         tpTicketRecord.setTicketId(ticketId);
 //        tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + userName.getUserName()+",联系方式:" + userName.getLoginName());
-        tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + taUser.getUserName()+",联系方式:" + taUser.getPhone());
+        tpTicketRecord.setContent("您的联系单已经分配给维修人员" + taUser.getUserName()+",联系方式:" + taUser.getPhone());
         tpTicketRecord.setStatus("3");
         tpTicketRecord.setCreateUser(user.toString());
         tpTicketRecord.setCreateDate(LocalDateTime.now());