96333坐席管理修改

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/CompanyBo.java

@@ -20,6 +20,7 @@ public class CompanyBo {
     private Long parentId;
     private Long sequenceNbr;
     private String regionCode;
+    private String companyCode;
     private List<CompanyBo> children;
 
     public String getAddress() {
@@ -125,5 +126,12 @@ public class CompanyBo {
 	public void setRegionCode(String regionCode) {
 		this.regionCode = regionCode;
 	}
-    
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/TzsCitInfoController.java

 package com.yeejoin.amos.boot.module.elevator.biz.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.CommonUtils;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.elevator.api.entity.TzsCitInfo;
 import com.yeejoin.amos.boot.module.elevator.api.service.ITzsCitInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.lang.reflect.Field;
+import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.List;
 
@@ -109,7 +109,7 @@ public class TzsCitInfoController extends BaseController {
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "列表分页查询", notes = "列表分页查询")
     public ResponseModel<IPage<TzsCitInfo>> listPage(String pageNum,String pageSize,@RequestBody TzsCitInfo tzsCitInfo){
-        tzsCitInfo.setRegionCode(this.getSelectedOrgInfo().getCompany().getRegionCode());
+        tzsCitInfo.setRegionCode(this.getSelectedOrgInfo().getCompany().getCompanyCode());
         Page<TzsCitInfo> pageBean;
         QueryWrapper<TzsCitInfo> tzsCitInfoQueryWrapper = new QueryWrapper<>();
         Class<? extends TzsCitInfo> aClass = tzsCitInfo.getClass();
@@ -137,6 +137,12 @@ public class TzsCitInfoController extends BaseController {
             }catch (Exception e) {
             }
         });
+        if (tzsCitInfo.getRegionCode().startsWith("610000") && tzsCitInfo.getRegionCode().length() >= 6) {
+            List<String> companyCode = Lists.newArrayList();
+            companyCode.add("610100");
+            companyCode.add("610400");
+            tzsCitInfoQueryWrapper.or().in("region_code", companyCode);
+        }
         IPage<TzsCitInfo> page;
         if (StringUtils.isBlank(pageNum)  ||StringUtils.isBlank(pageSize)) {
             pageBean = new Page<>(0, Long.MAX_VALUE);

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/TzsCitInfoServiceImpl.java

@@ -72,7 +72,6 @@ public class TzsCitInfoServiceImpl extends BaseService<TzsCitInfoDto, TzsCitInfo
         TzsCitInfo citInfo = this.getById(tzsCitInfo.getSequenceNbr());
         if(!ValidationUtil.isEmpty(citInfo)){
             code = citInfo.getCode();
-            extphone = citInfo.getExtphone();
         }
         if(ValidationUtil.isEmpty(tzsCitInfo.getSequenceNbr())) {
             if (!ValidationUtil.isEmpty(tzsCitInfo.getCtiUserId())) {
@@ -88,6 +87,7 @@ public class TzsCitInfoServiceImpl extends BaseService<TzsCitInfoDto, TzsCitInfo
                 return massage;
             }
         }
+        // 多个坐席可绑定一个话机，因此屏蔽以下代码
 //        if(!extphone.equals(tzsCitInfo.getExtphone())) {
 //            if (!ValidationUtil.isEmpty(this.list(new LambdaQueryWrapper<TzsCitInfo>().eq(TzsCitInfo::getExtphone, tzsCitInfo.getExtphone())))) {
 //                massage = "登录坐席参数extphone已存在，不可重复添加！";