|
|
@@ -5,22 +5,17 @@ import com.aliyun.oss.model.PutObjectRequest;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.mokamrp.privates.config.OSSConfiguration;
|
|
|
-import com.mokamrp.privates.entity.GetWorkRoomHandle;
|
|
|
import com.mokamrp.privates.entity.PostWorkEmployee;
|
|
|
import com.mokamrp.privates.entity.WorkEmployeeHandle;
|
|
|
import com.mokamrp.privates.mapper.*;
|
|
|
import com.mokamrp.privates.mapper.pojo.*;
|
|
|
import com.mokamrp.privates.mapper.vo.WorkEmployeeVo;
|
|
|
-import com.mokamrp.privates.mapper.vo.WorkRoomVo;
|
|
|
import com.mokamrp.privates.service.UserCorpService;
|
|
|
-import com.mokamrp.privates.service.WorkContactRoomService;
|
|
|
import com.mokamrp.privates.service.WorkEmployeeService;
|
|
|
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.mokamrp.privates.utils.OssFile;
|
|
|
import com.mokamrp.privates.utils.StringUtils;
|
|
|
-import jdk.nashorn.internal.objects.annotations.Where;
|
|
|
-import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -93,7 +88,7 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
|
|
|
|
|
|
Integer total = workEmployeeMapper.getVoListTotal(obj);
|
|
|
resMap.put("total", total);
|
|
|
- if(total <=0){
|
|
|
+ if (total <= 0) {
|
|
|
return resMap;
|
|
|
}
|
|
|
|
|
|
@@ -205,7 +200,7 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
|
|
|
obj.eq("a.private_tag_id", privateTagId);
|
|
|
}
|
|
|
|
|
|
- if (authCorpIds != null || authCorpIds.size()>=1) {
|
|
|
+ if (authCorpIds != null || authCorpIds.size() >= 1) {
|
|
|
obj.in("a.corp_id", authCorpIds);
|
|
|
}
|
|
|
|
|
|
@@ -219,21 +214,21 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
|
|
|
QueryWrapper<WorkRoom> roomObj = new QueryWrapper<WorkRoom>();
|
|
|
List<WorkEmployeeVo> list = workEmployeeMapper.getVoList(pageObj, room);
|
|
|
|
|
|
- int j =list.size();
|
|
|
+ int j = list.size();
|
|
|
|
|
|
if (j > 0) {
|
|
|
List<Object> ids = list.stream().map(WorkEmployeeVo -> WorkEmployeeVo.getId()).collect(Collectors.toList());
|
|
|
|
|
|
- obj.select("count(*) as nums,employee_id").in("employee_id",ids).groupBy("employee_id");
|
|
|
- List<Map<String,Object>> contactList= workContactEmployeeMapper.selectMaps(obj);
|
|
|
+ obj.select("count(*) as nums,employee_id").in("employee_id", ids).groupBy("employee_id");
|
|
|
+ List<Map<String, Object>> contactList = workContactEmployeeMapper.selectMaps(obj);
|
|
|
|
|
|
- workContactRoomObj.select("count(distinct(room_id)) as nums,employee_id").in("employee_id",ids)
|
|
|
- .eq("type",1)
|
|
|
+ workContactRoomObj.select("count(distinct(room_id)) as nums,employee_id").in("employee_id", ids)
|
|
|
+ .eq("type", 1)
|
|
|
.groupBy("employee_id");
|
|
|
- List<Map<String,Object>> workContactRoomList = workContactRoomMapper.selectMaps(workContactRoomObj);
|
|
|
+ List<Map<String, Object>> workContactRoomList = workContactRoomMapper.selectMaps(workContactRoomObj);
|
|
|
|
|
|
- roomObj.select("count(*) as nums,owner_id").in("owner_id",ids).groupBy("owner_id");
|
|
|
- List<Map<String,Object>> roomList = workRoomMapper.selectMaps(roomObj);
|
|
|
+ roomObj.select("count(*) as nums,owner_id").in("owner_id", ids).groupBy("owner_id");
|
|
|
+ List<Map<String, Object>> roomList = workRoomMapper.selectMaps(roomObj);
|
|
|
|
|
|
Object id;
|
|
|
for (int i = 0; i < j; i++) {
|
|
|
@@ -241,28 +236,28 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
|
|
|
list.get(i).setRoomNum(0);
|
|
|
list.get(i).setFanNum(0);
|
|
|
list.get(i).setInGroupCnt(0);
|
|
|
- for (Map<String,Object> r:roomList
|
|
|
+ for (Map<String, Object> r : roomList
|
|
|
) {
|
|
|
- if(r.get("owner_id").toString().equals(id.toString())){
|
|
|
+ if (r.get("owner_id").toString().equals(id.toString())) {
|
|
|
list.get(i).setRoomNum(r.get("nums"));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- for (Map<String,Object> contact:contactList
|
|
|
+ for (Map<String, Object> contact : contactList
|
|
|
) {
|
|
|
- if(contact.get("employee_id").toString().equals(id.toString())){
|
|
|
+ if (contact.get("employee_id").toString().equals(id.toString())) {
|
|
|
list.get(i).setFanNum(contact.get("nums"));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- for (Map<String,Object> workContactRoom:workContactRoomList
|
|
|
+ for (Map<String, Object> workContactRoom : workContactRoomList
|
|
|
) {
|
|
|
- if(workContactRoom.get("employee_id").toString().equals(id.toString())){
|
|
|
+ if (workContactRoom.get("employee_id").toString().equals(id.toString())) {
|
|
|
list.get(i).setInGroupCnt(Integer.parseInt(workContactRoom.get("nums").toString()));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- list.get(i).setThumbAvatar(ossConfiguration.getHost()+list.get(i).getThumbAvatar());
|
|
|
+ list.get(i).setThumbAvatar(ossConfiguration.getHost() + list.get(i).getThumbAvatar());
|
|
|
|
|
|
}
|
|
|
}
|
|
|
@@ -273,14 +268,15 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
|
|
|
|
|
|
/**
|
|
|
* 设置客服标签
|
|
|
+ *
|
|
|
* @param tagId
|
|
|
* @param employeeIds
|
|
|
* @return
|
|
|
*/
|
|
|
- public boolean setTag(Integer tagId,List<Integer> employeeIds){
|
|
|
+ public boolean setTag(Integer tagId, List<Integer> employeeIds) {
|
|
|
WorkEmployee workEmployee = new WorkEmployee();
|
|
|
workEmployee.setPrivateTagId(tagId);
|
|
|
- this.update(workEmployee,new UpdateWrapper<WorkEmployee>().in("id",employeeIds));
|
|
|
+ this.update(workEmployee, new UpdateWrapper<WorkEmployee>().in("id", employeeIds));
|
|
|
return true;
|
|
|
}
|
|
|
|