Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -119,6 +119,11 @@ public class TaUser implements Serializable {
     private String photo;
     private String description;
 
+    /**
+     * 工号
+     */
+    private String jobNumber;
+
     /**
      * 权重
      */

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

@@ -1,9 +1,12 @@
 package com.huiju.estateagents.property.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.common.UserElement;
@@ -22,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
+import java.util.List;
 
 /**
  * <p>
@@ -36,7 +40,7 @@ import java.io.IOException;
 @Api(value = "工单列表API", tags = "工单列表API")
 public class TpTicketController extends BaseController {
     @Autowired
-    private IUserService userService;
+    private ITaUserService userService;
 
     @Autowired
     private ITaPersonService taPersonService;
@@ -69,6 +73,18 @@ public class TpTicketController extends BaseController {
         ResponseBean  responseBean = tpTicketService.ticketDetails(parameter,userElement.getUserId(),userElement.getOrgId());
         return responseBean;
     }
+
+     @ApiOperation(value = "工单详情", notes = "工单详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:工单编号")
+    })
+
+    @RequestMapping(value = "/wx/ticketDetails", method = RequestMethod.POST)
+    public ResponseBean wxTicketDetails(@RequestBody String parameter, HttpServletRequest request){
+        ResponseBean  responseBean = tpTicketService.ticketDetails(parameter,null,getOrgId(request));
+        return responseBean;
+    }
+
     // @ApiOperation(value = "添加工单对话", notes = "添加工单对话")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "content:对话内容，imageUrl:[]图片,ticketId:工单id，" +
@@ -93,6 +109,26 @@ public class TpTicketController extends BaseController {
         ResponseBean  responseBean = tpTicketService.addRecord(parameter,userElement.getUserId(),userElement.getOrgId());
         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){
+        TaPerson person = taPersonService.getById(getPersonId(request));
+        LambdaQueryWrapper<TaUser> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaUser::getPhone,person.getPhone());
+        List<TaUser> list = userService.list(queryWrapper);
+        TaUser taUser = new TaUser();
+        if (list.size() > 0){
+            taUser = list.get(0);
+        }
+
+        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,textContent:拒绝的内容" )

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

@@ -360,7 +360,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
             messageModelAPP.setMessageType("7");
             messageModelAPP.setAdviceType("1");
             messageModelAPP.setModelType("2");
-            messageModelAPP.setUuid(e.getTaUserId().toString());
+//            messageModelAPP.setUuid(e.getTaUserId().toString());
             messageModelAPP.setUuidType("1");
             // 消息是物业端 发过来的, 就是 2
             messageModelAPP.setSource("2");

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

@@ -134,6 +134,9 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         userVerify.setVerifyName(user.getUserName());
         taUserVerifyMapper.updateById(userVerify);
 
+        taPerson.setName(userVerify.getOwnerName());
+        taPersonMapper.updateById(taPerson);
+
         if (Constant.APPROVED.equals(status)){
             // 审核通过加20积分
             applicationContext.publishEvent(new EventBus(userVerify, EventBus.EventType.UserVerify,1));
@@ -396,6 +399,11 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             taUserVerify.setVerifyStatus("1");
             taUserVerify.setVerifyName("自动审核通过");
             taUserVerifyMapper.updateById(taUserVerify);
+
+            TaPerson taPerson = taPersonMapper.selectById(personId);
+            taPerson.setName(taUserVerify.getOwnerName());
+            taPersonMapper.updateById(taPerson);
+
         }
 //        // 推送消息
 //        TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(taUserVerify.getCommunityId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());

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

@@ -104,10 +104,10 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
             }
 
             /*查询当前工单创建人*/
-            TaUserVerify taUserVerify= taUserVerifyMapper.selectById(tpTicket.getCreateUser());
+//            TaUserVerify taUserVerify= taUserVerifyMapper.selectById(tpTicket.getCreateUser());
 
-//            String createUserNmae=taUserMapper.selectLongNameAndorgId(taUserVerify.getUserId());
-//            tpTicketVO.setCreateUserNmae(createUserNmae);
+            TaPerson person =taPersonMapper.selectById(tpTicket.getCreateUser());
+            tpTicketVO.setCreateUserNmae(StringUtils.isNotEmpty(person.getName()) ? person.getName() : person.getNickname());
             tpTicketArrayList.add(tpTicketVO);
         }
         HashMap map=new HashMap<>();
@@ -128,7 +128,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         // 从taUserVerify里面获取userID
         TaPerson taPerson = taPersonMapper.selectById(ticketVO.getPersonId());
         /*发起人*/
-        ticketVO.setCreateUserNmae(taPerson.getNickname());
+        ticketVO.setCreateUserNmae(StringUtils.isNotEmpty(taPerson.getName()) ? taPerson.getName() : taPerson.getNickname());
         /*发起人手机号码*/
         ticketVO.setLoginName(taPerson.getPhone());
         /*查询当前受理人*/
@@ -140,11 +140,13 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         /*所有物业端本小区的人员*/
         QueryWrapper<TaUser> taUserQueryWrapper =new QueryWrapper<>();
         taUserQueryWrapper.eq("org_id",orgId);
-        taUserQueryWrapper.ne("user_id",userID);
+//        taUserQueryWrapper.ne("user_id",userID);
         taUserQueryWrapper.eq("type","life-consultant");
         ticketVO.setTpUsersList(taUserMapper.selectList(taUserQueryWrapper));
         /*本人*/
-        ticketVO.setCurrentUserName(userID.toString());
+        if (null != userID){
+            ticketVO.setCurrentUserName(userID.toString());
+        }
 
 
         /*查询工单类容的图片*/

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -942,6 +942,15 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             // 更新推广码
             person.setQrCodeId(customerFrom.getQrCodeId());
         }
+
+        // 变换person的身份
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+        taUserQueryWrapper.eq("phone",phone);
+        List<TaUser> userList = taUserMapper.selectList(taUserQueryWrapper);
+        if (userList.size() > 0){
+            TaUser taUser = userList.get(0);
+            person.setPersonType(taUser.getType());
+        }
         updateById(person);
 
         // 发放积分