fix(增加企业客服封禁相关功能)

src/main/java/com/mokamrp/privates/controller/WorkEmployeeController.java

@@ -76,7 +76,6 @@ public class WorkEmployeeController extends BaseController<WorkEmployee> {
     public Object getList(
             @AuthUser User authUser,
             @Valid @RequestBody PostWorkEmployee handle, BindingResult bindingResult) {
-
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }

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

@@ -27,6 +27,8 @@
         <result column="main_department_id" property="mainDepartmentId"/>
         <result column="log_user_id" property="logUserId"/>
         <result column="contact_auth" property="contactAuth"/>
+        <result column="prohibit_start_at" property="prohibitStartAt"/>
+        <result column="prohibit_end_at" property="prohibitEndAt"/>
         <result column="created_at" property="createdAt"/>
         <result column="updated_at" property="updatedAt"/>
         <result column="deleted_at" property="deletedAt"/>
@@ -35,7 +37,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id
-        , wx_user_id, corp_id, name, mobile, position, gender, email, avatar, thumb_avatar, telephone, alias, extattr, status, qr_code, external_profile, external_position, address, open_user_id, wx_main_department_id, main_department_id, log_user_id, contact_auth, created_at, updated_at, deleted_at
+        , wx_user_id, corp_id, name, mobile, position, gender, email, avatar, thumb_avatar, telephone, alias, extattr, status, qr_code, external_profile, external_position, address, open_user_id, wx_main_department_id, main_department_id, log_user_id, contact_auth,prohibit_start_at,prohibit_end_at,created_at, updated_at, deleted_at
     </sql>
 
     <select id="getVoList" resultType="com.mokamrp.privates.mapper.vo.WorkEmployeeVo">
@@ -59,7 +61,9 @@
             A.wx_user_id,
             C.`name` AS companyName,
             D.group_id,
-            E.tag_name
+            E.tag_name,
+            A.prohibit_start_at,
+            A.prohibit_end_at
         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/WorkEmployeeVo.java

@@ -1,5 +1,8 @@
 package com.mokamrp.privates.mapper.vo;
 
+import lombok.Data;
+import java.util.Date;
+
 /**
  * <p>
  * 通讯录 - 客户 中间表
@@ -8,6 +11,7 @@ package com.mokamrp.privates.mapper.vo;
  * @author gengyang
  * @since 2021-04-17
  */
+@Data
 public class WorkEmployeeVo {
 
     private Integer id;
@@ -33,6 +37,8 @@ public class WorkEmployeeVo {
     private Integer groupId;
     private String tagName;
     private String thumbAvatar;
+    private Date prohibitStartAt;
+    private Date prohibitEndAt;
 
     public String getThumbAvatar() {
         return thumbAvatar;

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

@@ -79,7 +79,9 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
 
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
-        Page<WorkEmployeeVo> pageObj = new Page<>(page, pagesize);
+        System.out.println(pagesize);
+        System.out.println(page);
+        Page<WorkEmployeeVo> pageObj = new Page<WorkEmployeeVo>(page, pagesize);
         Map<String, Object> resMap = new HashMap<String, Object>();
         resMap.put("list", null);
         resMap.put("total", 0);