exit

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileAgentController.java

@@ -4,6 +4,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileAgentService;
 import com.liquidnet.service.smile.entity.SmileAgent;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -18,6 +19,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2022-03-16
  */
+@Api(tags = "代理配置")
 @RestController
 @RequestMapping("/smile/agent")
 public class SmileAgentController {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileOrganizationController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 
 
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationParam;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileOrganizationService;
-import com.liquidnet.client.admin.zhengzai.smile.vo.SmileOrganizationVo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationVo;
 import com.liquidnet.service.smile.entity.SmileOrganization;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,8 +33,8 @@ public class SmileOrganizationController {
     @GetMapping("/list")
     @ApiOperation("获取组织列表")
     @ResponseBody
-    public AjaxResult organizationList(){
-        List<SmileOrganizationVo> organizationList = imsOrganizationService.organizationList();
+    public AjaxResult organizationList(SmileOrganizationParam smileOrganizationParam){
+        PageInfo<SmileOrganizationVo> organizationList = imsOrganizationService.organizationList(smileOrganizationParam);
         return AjaxResult.success(organizationList);
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileSchoolController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 
 
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileSchoolParam;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileSchoolService;
 import com.liquidnet.service.smile.entity.SmileSchool;
 import io.swagger.annotations.Api;
@@ -9,8 +11,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * <p>
  * 前端控制器
@@ -31,8 +31,8 @@ public class SmileSchoolController {
     @GetMapping("/list")
     @ApiOperation("获取学校列表")
     @ResponseBody
-    public AjaxResult schoolList(@RequestParam(name = "name", required = false) String name) {
-        List<SmileSchool> smileSchools = iSmileSchoolService.schoolList(name);
+    public AjaxResult schoolList(SmileSchoolParam smileSchoolParam) {
+        PageInfo<SmileSchool> smileSchools = iSmileSchoolService.schoolList(smileSchoolParam);
         return AjaxResult.success(smileSchools);
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserCheckController.java

@@ -3,7 +3,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserCheckService;
-import com.liquidnet.client.admin.zhengzai.smile.vo.UserCheckVo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckVo;
 import com.liquidnet.service.smile.entity.SmileUserCheck;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserParam;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
-import com.liquidnet.client.admin.zhengzai.smile.vo.SmileUserVo;
-import com.liquidnet.client.admin.zhengzai.smile.vo.SmileUserVoOrg;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVoOrg;
 import com.liquidnet.service.smile.entity.SmileUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,8 +35,8 @@ public class SmileUserController extends BaseController {
     @GetMapping("/list")
     @ApiOperation(value = "获取用户列表")
     @ResponseBody
-    public AjaxResult userList(@RequestParam(value = "phone", required = false)String phone){
-        List<SmileUserVo> smileUserVos = iSmileUserService.userList(phone);
+    public AjaxResult userList(SmileUserParam smileUserParam){
+        PageInfo<SmileUserVo> smileUserVos = iSmileUserService.userList(smileUserParam);
         return AjaxResult.success(smileUserVos);
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/vo/SchoolVo.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SchoolVo.java

-package com.liquidnet.client.admin.zhengzai.smile.vo;
+package com.liquidnet.client.admin.zhengzai.smile.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/vo/SmileAgentVo.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileAgentVo.java

-package com.liquidnet.client.admin.zhengzai.smile.vo;
+package com.liquidnet.client.admin.zhengzai.smile.dto;
 
 import lombok.Data;
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileOrganizationParam.java

+package com.liquidnet.client.admin.zhengzai.smile.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-14
+ */
+@Data
+public class SmileOrganizationParam {
+
+    @ApiModelProperty(value = "组织名称", example = "")
+    private String name;
+
+    @ApiModelProperty(value = "页数", example = "0")
+    @NotNull(message = "页数不能为空")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "数量", example = "20")
+    @NotNull(message = "数量不能为空")
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "排序字段", hidden = true)
+    private String orderItem;
+
+    @ApiModelProperty(value = "排序方式", hidden = true)
+    private String orderSc;
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/vo/SmileOrganizationVo.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileOrganizationVo.java

-package com.liquidnet.client.admin.zhengzai.smile.vo;
+package com.liquidnet.client.admin.zhengzai.smile.dto;
 
 import lombok.*;
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileSchoolParam.java

+package com.liquidnet.client.admin.zhengzai.smile.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-14
+ */
+@Data
+public class SmileSchoolParam {
+
+    @ApiModelProperty(value = "学校名称", example = "")
+    private String name;
+
+    @ApiModelProperty(value = "页数", example = "0")
+    @NotNull(message = "页数不能为空")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "数量", example = "20")
+    @NotNull(message = "数量不能为空")
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "排序字段", hidden = true)
+    private String orderItem;
+
+    @ApiModelProperty(value = "排序方式", hidden = true)
+    private String orderSc;
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileUserParam.java

+package com.liquidnet.client.admin.zhengzai.smile.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author TT
+ */
+@Data
+public class SmileUserParam {
+
+
+    @ApiModelProperty(value = "手机号", example = "")
+    private String phone;
+
+    @ApiModelProperty(value = "代理类型", example = "")
+    private Integer type;
+
+    @ApiModelProperty(value = "页数", example = "0")
+    @NotNull(message = "页数不能为空")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "数量", example = "20")
+    @NotNull(message = "数量不能为空")
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "排序字段", hidden = true)
+    private String orderItem;
+
+    @ApiModelProperty(value = "排序方式", hidden = true)
+    private String orderSc;
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/vo/SmileUserVo.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileUserVo.java

-package com.liquidnet.client.admin.zhengzai.smile.vo;
+package com.liquidnet.client.admin.zhengzai.smile.dto;
 
 import lombok.*;
 
@@ -13,7 +13,7 @@ public class SmileUserVo {
 
     private Long id;
 
-    private Long uid;
+    private String uid;
 
     /**
      * 照片

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/vo/SmileUserVoOrg.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileUserVoOrg.java

-package com.liquidnet.client.admin.zhengzai.smile.vo;
+package com.liquidnet.client.admin.zhengzai.smile.dto;
 
 import lombok.*;
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/vo/UserCheckVo.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserCheckVo.java

-package com.liquidnet.client.admin.zhengzai.smile.vo;
+package com.liquidnet.client.admin.zhengzai.smile.dto;
 
 import lombok.Builder;
 import lombok.Data;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileOrganizationService.java

@@ -2,11 +2,11 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.liquidnet.client.admin.zhengzai.smile.vo.SmileOrganizationVo;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationParam;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationVo;
 import com.liquidnet.service.smile.entity.SmileOrganization;
 
-import java.util.List;
-
 /**
  * <p>
  *  服务类
@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface ISmileOrganizationService extends IService<SmileOrganization> {
 
-    List<SmileOrganizationVo> organizationList();
+    PageInfo<SmileOrganizationVo> organizationList(SmileOrganizationParam smileOrganizationParam);
 
     Integer create(SmileOrganization smileOrganization);
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileSchoolService.java

@@ -2,10 +2,10 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileSchoolParam;
 import com.liquidnet.service.smile.entity.SmileSchool;
 
-import java.util.List;
-
 /**
  * <p>
  *  服务类
@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface ISmileSchoolService extends IService<SmileSchool> {
 
-    List<SmileSchool> schoolList(String name);
+    PageInfo<SmileSchool> schoolList(SmileSchoolParam smileSchoolParam);
 
     SmileSchool getSchoolById(Long id);
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileUserCheckService.java

@@ -2,7 +2,7 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.liquidnet.client.admin.zhengzai.smile.vo.UserCheckVo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckVo;
 import com.liquidnet.service.smile.entity.SmileUserCheck;
 
 import java.util.List;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileUserService.java

@@ -2,15 +2,17 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.liquidnet.client.admin.zhengzai.smile.vo.SmileUserVo;
-import com.liquidnet.client.admin.zhengzai.smile.vo.SmileUserVoOrg;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserParam;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVoOrg;
 import com.liquidnet.service.smile.entity.SmileUser;
 
 import java.util.List;
 
 public interface ISmileUserService  extends IService<SmileUser> {
 
-    List<SmileUserVo> userList(String phone);
+    PageInfo<SmileUserVo> userList(SmileUserParam smileUserParam);
 
     SmileUser getUserById(Long uid);
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileOrganizationServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.smile.service.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.utils.bean.BeanUtils;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationParam;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationVo;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileOrganizationService;
-import com.liquidnet.client.admin.zhengzai.smile.vo.SmileOrganizationVo;
+import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.smile.entity.SmileOrganization;
 import com.liquidnet.service.smile.mapper.SmileOrganizationMapper;
 import com.liquidnet.service.smile.mapper.SmileUserMapper;
@@ -16,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -37,8 +39,27 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
     SmileUserMapper smileUserMapper;
 
     @Override
-    public List<SmileOrganizationVo> organizationList() {
-        LambdaQueryWrapper<SmileOrganization> queryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
+    public PageInfo<SmileOrganizationVo> organizationList(SmileOrganizationParam smileOrganizationParam) {
+        PageInfo<SmileOrganizationVo> pageInfo;
+        try {
+            Map<String, Object> map = BeanUtil.convertBeanToMap(smileOrganizationParam);
+            List<SmileOrganization> smileOrganizations = smileOrganizationMapper.selectOrganizationList(map);
+            List<SmileOrganizationVo> smileOrganizationVos = smileOrganizations.stream().map(smileOrganization -> {
+                SmileOrganizationVo smileOrganizationVo = new SmileOrganizationVo();
+                BeanUtils.copyBeanProp(smileOrganization, smileOrganizationVo);
+                log.info("organizationList orgId:{}", smileOrganization.getId());
+                //关联查询人数
+                smileOrganizationVo.setProper(smileUserMapper.strip(smileOrganization.getId()));
+                return smileOrganizationVo;
+            }).collect(Collectors.toList());
+            pageInfo = new PageInfo<>(smileOrganizationVos);
+        }catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+        return pageInfo;
+
+        /*LambdaQueryWrapper<SmileOrganization> queryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
         queryWrapper.eq(SmileOrganization::getDelTag,0);
         List<SmileOrganization> smileOrganizations = smileOrganizationMapper.selectList(queryWrapper);
         return smileOrganizations.stream().map(smileOrganization -> {
@@ -48,7 +69,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
             //关联查询人数
             smileOrganizationVo.setProper(smileUserMapper.strip(smileOrganization.getId()));
             return smileOrganizationVo;
-        }).collect(Collectors.toList());
+        }).collect(Collectors.toList());*/
     }
 
     @Override

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileSchoolServiceImpl.java

@@ -4,19 +4,22 @@ package com.liquidnet.client.admin.zhengzai.smile.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SchoolVo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileSchoolParam;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileSchoolService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
-import com.liquidnet.client.admin.zhengzai.smile.vo.SchoolVo;
+import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.smile.entity.SmileSchool;
 import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
 import com.liquidnet.service.smile.mapper.SmileUserMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -43,13 +46,25 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
     SmileRedisUtils smileRedisUtils;
 
     @Override
-    public List<SmileSchool> schoolList(String name) {
-        LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
+    public PageInfo<SmileSchool> schoolList(SmileSchoolParam smileSchoolParam) {
+        PageInfo<SmileSchool> pageInfo;
+        try {
+            Map<String,Object> map = BeanUtil.convertBeanToMap(smileSchoolParam);
+            List<SmileSchool> smileSchools = smileSchoolMapper.selectSchoolList(map);
+            pageInfo = new PageInfo<SmileSchool>(smileSchools);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+        return pageInfo;
+
+        /*LambdaQueryWrapper<SmileSchool> queryWrapper = null;
+        queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
         if (StringUtils.isNotBlank(name)) {
             log.debug("smileSchool:name{}", name);
             queryWrapper.like(SmileSchool::getName, name);
         }
-        return smileSchoolMapper.selectList(queryWrapper);
+        return smileSchoolMapper.selectList(queryWrapper);*/
     }
 
     @Override

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserCheckServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserCheckService;
-import com.liquidnet.client.admin.zhengzai.smile.vo.UserCheckVo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckVo;
 import com.liquidnet.service.smile.entity.SmileUser;
 import com.liquidnet.service.smile.entity.SmileUserCheck;
 import com.liquidnet.service.smile.mapper.SmileSchoolMapper;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java

@@ -3,19 +3,22 @@ package com.liquidnet.client.admin.zhengzai.smile.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserParam;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVoOrg;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
-import com.liquidnet.client.admin.zhengzai.smile.vo.SmileUserVo;
-import com.liquidnet.client.admin.zhengzai.smile.vo.SmileUserVoOrg;
+import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.smile.entity.SmileUser;
 import com.liquidnet.service.smile.mapper.SmileUserMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -27,32 +30,47 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     SmileUserMapper smileUserMapper;
 
     @Override
-    public List<SmileUserVo> userList(String phone) {
-        //查询未删除，未通过审核的用户
+    public PageInfo<SmileUserVo> userList(SmileUserParam smileUserParam) {
+        PageInfo<SmileUserVo> pageInfo;
+        try {
+            Map<String, Object> map = BeanUtil.convertBeanToMap(smileUserParam);
+            List<SmileUserVo> smileUserVos = smileUserMapper.selectUserList(map).stream().map(smileUser -> {
+                SmileUserVo smileUserVo = new SmileUserVo();
+                BeanUtils.copyProperties(smileUser, smileUserVo);
+                return smileUserVo;
+            }).collect(Collectors.toList());
+            pageInfo = new PageInfo<SmileUserVo>(smileUserVos);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+        return pageInfo;
+
+        /*//查询未删除，未通过审核的用户
         LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
-        queryWrapper.eq(SmileUser::getDelTag,0);
-        queryWrapper.eq(false,SmileUser::getType,0);
-        if (StringUtils.isNotBlank(phone)){
-            queryWrapper.like(SmileUser::getPhone,phone);
+        queryWrapper.eq(SmileUser::getDelTag, 0);
+        queryWrapper.eq(false, SmileUser::getType, 0);
+        if (StringUtils.isNotBlank(phone)) {
+            queryWrapper.like(SmileUser::getPhone, phone);
         }
         List<SmileUser> smileUsers = smileUserMapper.selectList(queryWrapper);
         return smileUsers.stream().map(smileUser -> {
             SmileUserVo smileUserVo = new SmileUserVo();
             BeanUtils.copyProperties(smileUser, smileUserVo);
             return smileUserVo;
-        }).collect(Collectors.toList());
+        }).collect(Collectors.toList());*/
     }
 
     @Override
     public SmileUser getUserById(Long uid) {
-        log.info("查询用户id:{}",uid);
+        log.info("查询用户id:{}", uid);
         //查询未删除，未通过审核的用户,id=uid
         LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
-        queryWrapper.eq(SmileUser::getDelTag,0);
-        queryWrapper.eq(false,SmileUser::getType,0);
-        queryWrapper.eq(SmileUser::getId,uid);
+        queryWrapper.eq(SmileUser::getDelTag, 0);
+        queryWrapper.eq(false, SmileUser::getType, 0);
+        queryWrapper.eq(SmileUser::getId, uid);
         SmileUser smileUser = smileUserMapper.selectById(queryWrapper);
-        log.info("smileUser:{}",smileUser);
+        log.info("smileUser:{}", smileUser);
         return smileUser;
     }
 
@@ -61,17 +79,17 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
         smileUser.setCreatedDate(LocalDateTime.now());
         smileUser.setUpdatedDate(LocalDateTime.now());
         smileUser.setDelTag(0);
-        log.info("smileUser:{}",smileUser);
+        log.info("smileUser:{}", smileUser);
         int id = smileUserMapper.insert(smileUser);
-        log.info("return id:{}.",id);
+        log.info("return id:{}.", id);
         return id;
     }
 
     @Override
-    public List<SmileUserVoOrg> getUserListByOrgId(Long orgId,Long agentId) {
+    public List<SmileUserVoOrg> getUserListByOrgId(Long orgId, Long agentId) {
         //查询根据组织ID查询人员信息
         LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
-        queryWrapper.eq(SmileUser::getOrgId,orgId);
+        queryWrapper.eq(SmileUser::getOrgId, orgId);
         List<SmileUserVoOrg> smileUserVos = smileUserMapper.selectList(queryWrapper).stream().map(smileUser -> {
             SmileUserVoOrg smileUserVo = new SmileUserVoOrg();
             BeanUtils.copyProperties(smileUser, smileUserVo);

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileUser.java

@@ -28,7 +28,7 @@ public class SmileUser implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    private Long uid;
+    private String uid;
 
     /**
      * 照片

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileOrganizationMapper.java

@@ -4,6 +4,9 @@ package com.liquidnet.service.smile.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.smile.entity.SmileOrganization;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  Mapper 接口
@@ -15,4 +18,6 @@ import com.liquidnet.service.smile.entity.SmileOrganization;
 public interface SmileOrganizationMapper extends BaseMapper<SmileOrganization> {
 
     void update(SmileOrganization smileOrganization);
+
+    List<SmileOrganization> selectOrganizationList(Map<String, Object> map);
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileSchoolMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.smile.entity.SmileSchool;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +18,6 @@ import java.util.List;
 public interface SmileSchoolMapper extends BaseMapper<SmileSchool> {
 
     List<SmileSchool> selectListLimit();
+
+    List<SmileSchool> selectSchoolList(Map<String, Object> map);
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileUserMapper.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.smile.entity.SmileUser;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 public interface SmileUserMapper extends BaseMapper<SmileUser> {
 
     /**
@@ -21,4 +24,6 @@ public interface SmileUserMapper extends BaseMapper<SmileUser> {
     String selectUserNameById(@Param("id") Long agentId);
 
     Integer updateUserSchoolBySchoolId(@Param("schoolId") String id,@Param("schoolName") String name);
+
+    List<SmileUser> selectUserList(Map<String, Object> map);
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileOrganizationMapper.xml

@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.smile.mapper.SmileOrganizationMapper">
 
+    <select id="selectOrganizationList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileOrganization">
+        select * from smilt_organization
+        <where>
+            <if test="name!=''">
+                and `name` like concat('%',#{name},'%')
+            </if>
+        </where>
+    </select>
 </mapper>

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileSchoolMapper.xml

@@ -5,4 +5,14 @@
     <select id="selectListLimit" resultType="com.liquidnet.service.smile.entity.SmileSchool">
         select id,name from smile_school limit 20;
     </select>
+
+    <select id="selectSchoolList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileSchool">
+        select *
+        from smile_school
+        <where>
+            <if test="name!=''">
+                AND `name` LIKE concat('%',#{name},'%')
+            </if>
+        </where>
+    </select>
 </mapper>

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml

@@ -12,4 +12,13 @@
     <update id="updateUserSchoolBySchoolId">
         update smile_user set school_name = #{schoolName}  where school_id = #{schoolId};
     </update>
+
+    <select id="selectUserList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileUser">
+        select * from smile_user
+        <where>
+            <if test="phone!=''">
+                AND phone Like concat('%',#{phone},'%')
+            </if>
+        </where>
+    </select>
 </mapper>