From 6705385361aea5819cadd3efae0735521d22da7b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 05 Jan 2021 16:50:31 +0800
Subject: [PATCH] Merge branch 'api' into order_reform
---
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 | 14 +++++-
zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java | 2 +
zq-erp/src/main/java/com/matrix/system/app/vo/BeauticianVo.java | 30 +++++++++++++++
zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml | 2
5 files changed, 67 insertions(+), 4 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..5858e80 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;
@@ -13,6 +14,7 @@
import com.matrix.system.app.vo.UserAchieveVo;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.service.SysUsersService;
+import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysWorkBeatuistaff;
import com.matrix.system.hive.service.AchieveNewService;
@@ -108,12 +110,18 @@
@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());
+ if (DataAuthUtil.hasAllShopAuth()) {
+ query.setCompanyId(sysUsers.getCompanyId());
+ } else {
+ 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/mapper/SysUsersMapper.java b/zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java
index 4bcfc7a..0a238e8 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java
@@ -18,6 +18,8 @@
@Mapping(source = "suId", target = "id")
@Mapping(source = "suName", target = "name")
+ @Mapping(source = "suPhoto", target = "photo")
+ @Mapping(source = "suTel", target = "telphone")
public abstract BeauticianVo sysUsersToBeauticianVo(SysUsers sysUsers);
public abstract List<BeauticianVo> usersListToBeautyList(List<SysUsers> list);
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..8e25766 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,12 @@
private String name;
+ private String roleName;
+
+ private String photo;
+
+ private String telphone;
+
public Long getId() {
return id;
}
@@ -28,4 +34,28 @@
public void setName(String name) {
this.name = name;
}
+
+ public String getRoleName() {
+ return roleName;
+ }
+
+ public void setRoleName(String roleName) {
+ this.roleName = roleName;
+ }
+
+ public String getPhoto() {
+ return photo;
+ }
+
+ public void setPhoto(String photo) {
+ this.photo = photo;
+ }
+
+ public String getTelphone() {
+ return telphone;
+ }
+
+ public void setTelphone(String telphone) {
+ this.telphone = telphone;
+ }
}
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