Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

src/main/java/com/mokamrp/privates/mapper/GroupMapper.xml

@@ -41,6 +41,7 @@
         LEFT JOIN mc_corp AS C on A.corp_id = C.id
         LEFT JOIN mc_work_employee AS D ON C.id = D.corp_id
         WHERE A.corp_id IN (#{corpIds})
+        group by a.id
     </select>
 
     <select id="getBaseJoinList" resultType="com.mokamrp.privates.mapper.vo.WorkGroupDataVo">

src/main/java/com/mokamrp/privates/mapper/RoomTagMapper.java

@@ -2,6 +2,7 @@ package com.mokamrp.privates.mapper;
 
 import com.mokamrp.privates.mapper.pojo.RoomTag;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gy
  * @since 2021-04-22
  */
+@Component
 public interface RoomTagMapper extends BaseMapper<RoomTag> {
 
 }

src/main/java/com/mokamrp/privates/mapper/WorkContactRoomMapper.xml

@@ -51,13 +51,15 @@
         a.join_time,
         a.out_time,
         b.`name` as nick_name,
+        c.`name` as employee_name,
+        c.`avatar` as employee_avatar,
         b.avatar
         FROM
         mc_work_contact_room AS a
         LEFT JOIN mc_work_contact AS b ON b.id = a.contact_id
-        <where>
+        LEFT JOIN mc_work_employee AS c ON c.id = a.employee_id
+        WHERE
             ${ew.sqlSegment}
-        </where>
     </select>
 
     <select id="getListByRoomIdTotal" resultType="Integer">
@@ -66,9 +68,9 @@
         FROM
         mc_work_contact_room AS a
         LEFT JOIN mc_work_contact AS b ON b.id = a.contact_id
-        <where>
+        LEFT JOIN mc_work_employee AS c ON c.id = a.employee_id
+        WHERE
             ${ew.sqlSegment}
-        </where>
     </select>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/WorkEmployeeMapper.xml

@@ -69,13 +69,14 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        group by a.id
   </select>
 
 
     <select id="getVoListTotal" resultType="Integer">
 
         SELECT
-            count(*)
+            count(distinct(a.id))
         FROM
             mc_work_employee AS A
         LEFT JOIN private_group_corp AS D ON A.corp_id = D.corp_id

src/main/java/com/mokamrp/privates/mapper/vo/WorkContactEmployeeVo.java

@@ -21,6 +21,7 @@ public class WorkContactEmployeeVo {
     private Date clientDeletedAt;
     private Date clientCreatedAt;
     private Integer clientUnionid;
+    private Integer clientGender;
     private String employeeName;
     private String companyName;
     private String channelCodeName;
@@ -33,6 +34,14 @@ public class WorkContactEmployeeVo {
     private String tagIds;
     private Integer employeeId;
 
+    public Integer getClientGender() {
+        return clientGender;
+    }
+
+    public void setClientGender(Integer clientGender) {
+        this.clientGender = clientGender;
+    }
+
     public Integer getEmployeeId() {
         return employeeId;
     }

src/main/java/com/mokamrp/privates/mapper/vo/WorkContactRoomByRoomIdVo.java

@@ -20,6 +20,24 @@ public class WorkContactRoomByRoomIdVo {
     private Integer type;
     private Integer status;
     private String joinTime;
+    private String employeeName;
+    private String employeeAvatar;
+
+    public String getEmployeeName() {
+        return employeeName;
+    }
+
+    public void setEmployeeName(String employeeName) {
+        this.employeeName = employeeName;
+    }
+
+    public String getEmployeeAvatar() {
+        return employeeAvatar;
+    }
+
+    public void setEmployeeAvatar(String employeeAvatar) {
+        this.employeeAvatar = employeeAvatar;
+    }
 
     public String getWxUserId() {
         return wxUserId;
@@ -78,7 +96,7 @@ public class WorkContactRoomByRoomIdVo {
     }
 
     private String outTime;
-    private String nick_name;
+    private String nickName;
     private String avatar;
 
     public Integer getId() {
@@ -113,12 +131,12 @@ public class WorkContactRoomByRoomIdVo {
         this.status = status;
     }
 
-    public String getNick_name() {
-        return nick_name;
+    public String getNickName() {
+        return nickName;
     }
 
-    public void setNick_name(String nick_name) {
-        this.nick_name = nick_name;
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
     }
 
     public String getAvatar() {

src/main/java/com/mokamrp/privates/mapper/vo/WorkContactRoomGroupDataVo.java

@@ -13,7 +13,7 @@ import java.util.Date;
 public class WorkContactRoomGroupDataVo {
 
     private Integer num;
-    private Integer room_id;
+    private Integer roomId;
 
     public Integer getNum() {
         return num;
@@ -23,13 +23,12 @@ public class WorkContactRoomGroupDataVo {
         this.num = num;
     }
 
-    public Integer getRoom_id() {
-        return room_id;
+    public Integer getRoomId() {
+        return roomId;
     }
 
-    public void setRoom_id(Integer room_id) {
-        this.room_id = room_id;
+    public void setRoomId(Integer roomId) {
+        this.roomId = roomId;
     }
 
-
 }

src/main/java/com/mokamrp/privates/service/impl/WorkContactRoomServiceImpl.java

@@ -43,7 +43,6 @@ public class WorkContactRoomServiceImpl extends ServiceImpl<WorkContactRoomMappe
 
         Iterator fileterIt = indexHandle.getFilter().entrySet().iterator();
         QueryWrapper<WorkContactRoomByRoomIdVo> warpper = new QueryWrapper<WorkContactRoomByRoomIdVo>();
-        //.@leon where like,=,<>
         while (fileterIt.hasNext()) {
             Map.Entry entray = (Map.Entry) fileterIt.next();
             Object key = entray.getKey();
@@ -53,9 +52,8 @@ public class WorkContactRoomServiceImpl extends ServiceImpl<WorkContactRoomMappe
             if (op.get(key) == null || op.get(key).isEmpty() || op.get(key).toString().equals("=")) {
                 warpper.eq(StringUtils.humpToLine2(key.toString()), value.toString());
             } else if (op.get(key).toString().equals("like")) {
-                warpper.like(StringUtils.humpToLine2(key.toString()), "%" + value.toString() + "%");
-            } else if (op.get(key).toString().equals("<>")) {
-                warpper.ne(StringUtils.humpToLine2(key.toString()), value.toString());
+                warpper.and(wrapper -> wrapper.like(StringUtils.humpToLine2(key.toString()), "%" + value.toString() + "%")
+                        .or().like("c.name", "%" + value.toString() + "%"));
             }
         }
 

src/main/java/com/mokamrp/privates/service/impl/WorkEmployeeServiceImpl.java

@@ -193,7 +193,7 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
             obj.eq("D.group_id", groupId);
         }
 
-        if (mobile != null) {
+        if (mobile != null && !mobile.isEmpty()) {
             obj.eq("A.mobile", mobile);
         }
 

src/main/java/com/mokamrp/privates/service/impl/WorkRoomServiceImpl.java

@@ -62,8 +62,6 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
     @Override
     public Map<String, Object> getPageList(GetWorkRoomHandle handle) {
 
-        Integer pagesize = handle.getPagesize();
-        Integer page = handle.getPage();
         Map<String, Object> resMap = new HashMap<String, Object>();
         resMap.put("list", null);
         resMap.put("total", 0);
@@ -150,11 +148,13 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         if (list.size() > 0) {
             List<Integer> ids = list.stream().map(WorkRoomVo -> WorkRoomVo.getId()).collect(Collectors.toList());
             HashMap<Integer, HashMap<String, Integer>> dataById = getDataById(ids);
+            System.out.println(dataById);
 
             QueryWrapper<WorkRoomVo> tagObj = new QueryWrapper<WorkRoomVo>();
             tagObj.in("a.id", ids);
             List<HashMap<String, Object>> tagMapData = mapperObj.getRoomTagList(tagObj);
 
+
             if (dataById.size() > 0) {
                 int j  = list.size();
                 list = list.stream().map(WorkRwoomVo -> {
@@ -171,7 +171,6 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
                         detail.setLeftNum(dataById.get(detail.getId()).get("left_num"));
                     }
 
-
                     for (HashMap<String,Object> m :tagMapData){
                         if(m.get("id").toString().equals(detail.getId().toString())){
                             if(m.get("tag_names") != null){
@@ -184,7 +183,6 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
                         }
                     }
 
-
                     return detail;
                 }).collect(Collectors.toList());
             }
@@ -343,7 +341,6 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         QueryWrapper<WorkContactRoom> contactRoomQueryWrapperTodayAdd = new QueryWrapper<WorkContactRoom>();
         QueryWrapper<WorkContactRoom> contactRoomQueryWrapperTodayLeft = new QueryWrapper<WorkContactRoom>();
 
-
         contactRoomQueryWrapperTotal.in("room_id", ids);
         contactRoomQueryWrapperTotal.eq("status", 1);
 
@@ -366,43 +363,46 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
 
         HashMap<String, Integer> temp = new HashMap<String, Integer>();
         for (WorkContactRoomGroupDataVo o : totals) {
+            temp = new HashMap<String, Integer>();
             temp.put("total", o.getNum());
             temp.put("add_num", 0);
             temp.put("left_num", 0);
-            dataById.put(o.getRoom_id(), temp);
+            dataById.put(o.getRoomId(), temp);
         }
 
         HashMap<String, Integer> tempSetLeft = new HashMap<String, Integer>();
-        for (WorkContactRoomGroupDataVo o : todayLefts) {
-            if (dataById.get(o.getRoom_id()) == null) {//不存在
+        for (WorkContactRoomGroupDataVo l : todayLefts) {
+            if (dataById.get(l.getRoomId()) == null) {//不存在
+                temp = new HashMap<String, Integer>();
                 temp.put("total", 0);
-                temp.put("left_num", o.getNum());
+                temp.put("left_num", l.getNum());
                 temp.put("add_num", 0);
-                dataById.put(o.getRoom_id(), temp);
+                dataById.put(l.getRoomId(), temp);
             } else {
-                tempSetLeft = dataById.get(o.getRoom_id());
-                tempSetLeft.put("left_num", o.getNum());
-                dataById.put(o.getRoom_id(), tempSetLeft);
+                tempSetLeft = new HashMap<String, Integer>();
+                tempSetLeft = dataById.get(l.getRoomId());
+                tempSetLeft.put("left_num", l.getNum());
+                dataById.put(l.getRoomId(), tempSetLeft);
             }
-
         }
 
         HashMap<String, Integer> tempSetAdd = new HashMap<String, Integer>();
-        for (WorkContactRoomGroupDataVo o : todayAdds) {
-            if (dataById.get(o.getRoom_id()) == null) {
+        for (WorkContactRoomGroupDataVo a : todayAdds) {
+            if (dataById.get(a.getRoomId()) == null) {
+                temp = new HashMap<String, Integer>();
                 temp.put("total", 0);
-                temp.put("add_num", o.getNum());
+                temp.put("add_num", a.getNum());
                 temp.put("left_num", 0);
-                dataById.put(o.getRoom_id(), temp);
+                dataById.put(a.getRoomId(), temp);
             } else {
-                tempSetAdd = dataById.get(o.getRoom_id());
-                tempSetAdd.put("add_num", o.getNum());
-                dataById.put(o.getRoom_id(), tempSetAdd);
+                tempSetAdd = new HashMap<String, Integer>();
+                tempSetAdd = dataById.get(a.getRoomId());
+                tempSetAdd.put("add_num", a.getNum());
+                dataById.put(a.getRoomId(), tempSetAdd);
             }
         }
 
         return dataById;
-
     }