exit 获取用户列表修改

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

@@ -43,8 +43,8 @@ public class SmileUserController extends BaseController {
     @ApiOperation(value = "获取用户列表")
     @ResponseBody
     public TableDataInfo userList(SmileUserParam smileUserParam) {
-        TableDataInfo rspData = iSmileUserService.userList(smileUserParam);
-        return rspData;
+        PageHelper.startPage(smileUserParam.getPageNum(), smileUserParam.getPageSize());
+        return getDataTable(iSmileUserService.userList(smileUserParam));
     }
 
     @PostMapping("/getUserById")

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

@@ -43,9 +43,4 @@ public class SmileUserParam {
     @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/SmileUserVo.java

 package com.liquidnet.client.admin.zhengzai.smile.dto;
 
+import com.liquidnet.service.smile.entity.SmileUser;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
-public class SmileUserVo {
+public class SmileUserVo implements Serializable, Cloneable{
 
     private Long id;
 
@@ -184,4 +186,16 @@ public class SmileUserVo {
     
     @ApiModelProperty("创建时间")
     private LocalDateTime createdDate;
+
+    private static final SmileUserVo obj = new SmileUserVo();
+
+    public static SmileUserVo getNew() {
+        try {
+            return (SmileUserVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new SmileUserVo();
+    }
+
 }

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

@@ -13,7 +13,7 @@ import java.util.List;
 
 public interface ISmileUserService extends IService<SmileUser> {
 
-    TableDataInfo userList(SmileUserParam smileUserParam);
+    List<SmileUser> userList(SmileUserParam smileUserParam);
 
     SmileUserVo getUserById(String id);
 

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

@@ -11,6 +11,7 @@ import com.liquidnet.client.admin.zhengzai.smile.service.ISmileSchoolService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
+import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.smile.entity.SmileSchool;
 import com.liquidnet.service.smile.entity.SmileUser;
 import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
@@ -100,6 +101,16 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
         queryWrapper.eq(SmileSchool::getDelTag, 0);
         if (smileSchoolMapper.update(smileSchool, queryWrapper) > 0) {
             //更新User表  根据学校id修改用户学校名称
+            LambdaQueryWrapper<SmileUser> smileUserLambdaQueryWrapper = Wrappers.lambdaQuery(SmileUser.class);
+            smileUserLambdaQueryWrapper.select(SmileUser::getUid);
+            smileUserLambdaQueryWrapper.eq(SmileUser::getSchoolId,smileSchool.getId());
+            List<SmileUser> smileUsers = smileUserMapper.selectList(smileUserLambdaQueryWrapper);
+            smileUsers.forEach(smileUser -> {
+                SmileUserVO smileUserVO = smileRedisUtils.getSmileUserVO(smileUser.getUid());
+                smileUserVO.setSchoolName(smileSchool.getName());
+                smileRedisUtils.setSmileUserVO(smileUser.getUid(),smileUserVO);
+            });
+
             smileUserMapper.updateUserSchoolBySchoolId(smileSchool.getId().toString(), smileSchool.getName());
             smileRedisUtils.setSchool(String.valueOf(smileSchool.getId()), smileSchool.getName());
             //修改数据

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

@@ -5,7 +5,6 @@ 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.core.domain.AjaxResult;
-import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.smile.dto.*;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
@@ -55,30 +54,15 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     SmileAgentMapper smileAgentMapper;
 
     @Override
-    public TableDataInfo userList(SmileUserParam smileUserParam) {
-        PageInfo<SmileUser> pageInfo;
-        TableDataInfo rspData = new TableDataInfo();
+    public List<SmileUser> userList(SmileUserParam smileUserParam) {
         try {
             //查询通过审核通过的用户 type！=0、1   未删除用户
             Map<String, Object> map = BeanUtil.convertBeanToMap(smileUserParam);
-            List<SmileUser> smileUsers = smileUserMapper.selectUserList(map);
-            pageInfo = new PageInfo<SmileUser>(smileUsers);
-            List<SmileUserVo> smileUserVos = smileUsers.stream().map(smileUser -> {
-                //获取学校名
-                SmileUserVo smileUserVo = new SmileUserVo();
-                BeanUtils.copyProperties(smileUser, smileUserVo);
-                smileUserVo.setSchoolName(getSchoolNameById(smileUser.getSchoolId()));
-                return smileUserVo;
-            }).collect(Collectors.toList());
-
-            rspData.setCode(0);
-            rspData.setRows(smileUserVos);
-            rspData.setTotal(pageInfo.getTotal());
+            return smileUserMapper.selectUserList(map);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
-        return rspData;
     }
 
     private String getSchoolNameById(String schoolId) {

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

@@ -45,7 +45,7 @@
     <select id="selectUserList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileUser">
         select * from smile_user
         <where>
-            del_tag = 0 AND type != 0 AND type != 3 AND type != 4 and type!=5
+            del_tag = 0 AND type in (1,2,5)
             <if test="phone!='' and phone !=null">
                 AND phone Like concat('%',#{phone},'%')
             </if>
@@ -62,7 +62,6 @@
                 AND school_id = #{schoolId}
             </if>
         </where>
-        ORDER BY id desc
     </select>
     <select id="pageUser" parameterType="int" resultType="com.liquidnet.service.smile.entity.SmileUser">
         select * from smile_user
@@ -150,45 +149,48 @@
 
     <select id="getAllUidByPerId" parameterType="java.util.Map"
             resultType="com.liquidnet.service.smile.entity.SmileUser">
-        SELECT
-            su.uid,
-            su.`name`,
-            su.`type`,
-            su.province_id,
-            su.province,
-            su.city_id,
-            su.city,
-            su.area_id,
-            su.area,
-            su.address
-        FROM
-            smile_user AS su
-                INNER JOIN ( SELECT mid, agent_id, agent_id_master FROM kylin_order_ticket_relations WHERE performance_id = #{performancesId} AND agent_id != 0 GROUP BY agent_id ) kk ON kk.agent_id = su.uid
-                OR kk.agent_id_master = su.uid
-        GROUP BY
-            su.uid
+        SELECT su.uid,
+               su.`name`,
+               su.`type`,
+               su.province_id,
+               su.province,
+               su.city_id,
+               su.city,
+               su.area_id,
+               su.area,
+               su.address
+        FROM smile_user AS su
+                 INNER JOIN (SELECT mid, agent_id, agent_id_master
+                             FROM kylin_order_ticket_relations
+                             WHERE performance_id = #{performancesId}
+                               AND agent_id != 0
+                             GROUP BY agent_id) kk ON kk.agent_id = su.uid
+            OR kk.agent_id_master = su.uid
+        GROUP BY su.uid
     </select>
 
     <select id="selectUidByPerId" resultType="com.liquidnet.service.smile.entity.SmileUser">
-        SELECT
-            su.uid,
-            su.name,
-            su.type,
-            su.city
-        FROM
-            smile_user AS su
-                INNER JOIN ( SELECT kotr.agent_id, kotr.agent_id_master FROM kylin_order_ticket_relations AS kotr WHERE kotr.performance_id = #{performancesId} AND kotr.agent_id != 0 ) kk ON su.uid = kk.agent_id_master
+        SELECT su.uid,
+               su.name,
+               su.type,
+               su.city
+        FROM smile_user AS su
+                 INNER JOIN (SELECT kotr.agent_id, kotr.agent_id_master
+                             FROM kylin_order_ticket_relations AS kotr
+                             WHERE kotr.performance_id = #{performancesId}
+                               AND kotr.agent_id != 0) kk ON su.uid = kk.agent_id_master
         WHERE su.type = 1
         GROUP BY su.uid
     </select>
 
     <select id="selectUidByPerIdNotType" resultType="com.liquidnet.service.smile.entity.SmileUser">
-        SELECT
-            su.uid
-        FROM
-            smile_user AS su
-                INNER JOIN ( SELECT kotr.agent_id, kotr.agent_id_master FROM kylin_order_ticket_relations AS kotr WHERE kotr.performance_id = #{performancesId} AND kotr.agent_id != 0 ) kk ON su.uid = kk.agent_id
-                OR su.uid = kk.agent_id_master
+        SELECT su.uid
+        FROM smile_user AS su
+                 INNER JOIN (SELECT kotr.agent_id, kotr.agent_id_master
+                             FROM kylin_order_ticket_relations AS kotr
+                             WHERE kotr.performance_id = #{performancesId}
+                               AND kotr.agent_id != 0) kk ON su.uid = kk.agent_id
+            OR su.uid = kk.agent_id_master
         GROUP BY su.uid
     </select>