ソースを参照

fix(客服库列表增加一个标签字段)

gengyang 5 年 前
コミット
06e5096c0c

+ 2 - 0
src/main/java/com/mokamrp/privates/entity/WorkEmployeeHandle.java

@@ -24,5 +24,7 @@ public class WorkEmployeeHandle {
     private String admin;
     //.标签
     private Integer tag;
+    //.标签
+    private Integer privateTagId;
 
 }

+ 4 - 1
src/main/java/com/mokamrp/privates/mapper/WorkEmployeeMapper.xml

@@ -57,12 +57,14 @@
             A.in_group_cnt,
             A.wx_user_id,
             C.`name` AS companyName,
-            D.group_id
+            D.group_id,
+            E.tag_name
         FROM
             mc_work_employee AS A
             LEFT JOIN private_group_corp AS D ON A.corp_id = D.corp_id
             LEFT JOIN private_group AS B ON D.group_id = B.id
             LEFT JOIN mc_corp AS C ON A.corp_id = C.id
+            LEFT JOIN private_tag AS E ON E.id = A.private_tag_id
         <where>
             ${ew.sqlSegment}
         </where>
@@ -78,6 +80,7 @@
         LEFT JOIN private_group_corp AS D ON A.corp_id = D.corp_id
         LEFT JOIN private_group AS B ON D.group_id = B.id
         LEFT JOIN mc_corp AS C ON A.corp_id = C.id
+        LEFT JOIN private_tag AS E ON E.id = A.private_tag_id
         <where>
             ${ew.sqlSegment}
         </where>

+ 9 - 0
src/main/java/com/mokamrp/privates/mapper/vo/WorkEmployeeVo.java

@@ -33,6 +33,15 @@ public class WorkEmployeeVo {
     private Object fanNum;
     private String wxUserId;
     private Integer groupId;
+    private String tagName;
+
+    public String getTagName() {
+        return tagName;
+    }
+
+    public void setTagName(String tagName) {
+        this.tagName = tagName;
+    }
 
     public Integer getGroupId() {
         return groupId;

+ 5 - 1
src/main/java/com/mokamrp/privates/service/impl/WorkEmployeeServiceImpl.java

@@ -163,6 +163,7 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
         Integer gender = handle.getGender();
         Integer groupId = handle.getGroupId();
         String mobile = handle.getMobile();
+        Integer privateTagId = handle.getPrivateTagId();
 
         QueryWrapper<WorkEmployeeVo> obj = new QueryWrapper<WorkEmployeeVo>();
 
@@ -176,11 +177,14 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
             obj.eq("A.gender", gender);
         }
 
+        if (privateTagId != null) {
+            obj.eq("A.private_tag_id", privateTagId);
+        }
+
         if (groupId != null) {
             obj.eq("D.group_id", groupId);
         }
 
-
         if (mobile != null) {
             obj.eq("A.mobile", mobile);
         }