From 639001bf955f184b8601ec27254a4cabadf6c16c Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 05 Jan 2021 16:44:43 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/app/dto/UsersQueryDto.java | 23 +++++++++++++++++++++++ zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | 7 +++++-- zq-erp/src/main/java/com/matrix/system/app/vo/BeauticianVo.java | 10 ++++++++++ zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml | 2 +- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java index 020ad65..c5018bc 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java +++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java @@ -6,6 +6,7 @@ import com.matrix.core.tools.DateUtil; import com.matrix.core.tools.WebUtil; import com.matrix.system.app.dto.BeauticianDto; +import com.matrix.system.app.dto.UsersQueryDto; import com.matrix.system.app.mapper.SysBeauticianStateMapper; import com.matrix.system.app.mapper.SysUsersMapper; import com.matrix.system.app.mapper.SysWorkBeatuistaffMapper; @@ -108,12 +109,14 @@ @ApiResponses({ @ApiResponse(code = 200, message = "ok", response = BeauticianVo.class) }) - @GetMapping(value = "/findAllUsers") - public AjaxResult findAllUsers() { + @PostMapping(value = "/findAllUsers") + public AjaxResult findAllUsers(@RequestBody UsersQueryDto usersQueryDto) { SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); SysUsers query = new SysUsers(); query.setCompanyId(sysUsers.getCompanyId()); + query.setShopId(sysUsers.getShopId()); + query.setSuName(usersQueryDto.getQueryKey()); List<SysUsers> list = sysUsersService.findByModel(query); List<BeauticianVo> dataList = SysUsersMapper.INSTANCE.usersListToBeautyList(list); return AjaxResult.buildSuccessInstance(dataList); diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/UsersQueryDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/UsersQueryDto.java new file mode 100644 index 0000000..8374880 --- /dev/null +++ b/zq-erp/src/main/java/com/matrix/system/app/dto/UsersQueryDto.java @@ -0,0 +1,23 @@ +package com.matrix.system.app.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author wzy + * @date 2021-01-05 + **/ +@ApiModel(value = "UsersQueryDto", description = "员工列表接口参数类") +public class UsersQueryDto { + + @ApiModelProperty(value = "查询参数") + private String queryKey; + + public String getQueryKey() { + return queryKey; + } + + public void setQueryKey(String queryKey) { + this.queryKey = queryKey; + } +} diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/BeauticianVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/BeauticianVo.java index 2542a67..e7cafcc 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/vo/BeauticianVo.java +++ b/zq-erp/src/main/java/com/matrix/system/app/vo/BeauticianVo.java @@ -13,6 +13,8 @@ private String name; + private String roleName; + public Long getId() { return id; } @@ -28,4 +30,12 @@ public void setName(String name) { this.name = name; } + + public String getRoleName() { + return roleName; + } + + public void setRoleName(String roleName) { + this.roleName = roleName; + } } diff --git a/zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml b/zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml index 321834c..9534312 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml @@ -960,7 +960,7 @@ </if> <if test="(record.suName!=null and record.suName!='') or (record.suName!='' and record.suName==0)"> - and su_name like concat('%',#{record.suName},'%') + and (su_name like concat('%',concat(#{record.suName},'%')) or su_tel = #{record.suName}) </if> <if test="(record.suTel!=null and record.suTel!='') or (record.suTel!='' and record.suTel==0)"> -- Gitblit v1.9.1