From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
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 cbcc4ea..4c58e8e 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
@@ -1,6 +1,8 @@
package com.matrix.system.app.mapper;
+import com.matrix.system.app.dto.ModifyUserDto;
import com.matrix.system.app.vo.BeauticianVo;
+import com.matrix.system.app.vo.UserInfoDetailVo;
import com.matrix.system.common.bean.SysUsers;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@@ -16,10 +18,36 @@
public abstract class SysUsersMapper {
public static final SysUsersMapper INSTANCE = Mappers.getMapper(SysUsersMapper.class);
- @Mapping(source = "su_id", target = "id")
- @Mapping(source = "su_name", target = "name")
+ @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);
+ @Mapping(source = "suPhoto", target = "photo")
+ @Mapping(source = "suName", target = "name")
+ @Mapping(source = "suAliases", target = "engName")
+ @Mapping(source = "suTel", target = "telphone")
+ @Mapping(source = "suSex", target = "sex")
+ @Mapping(source = "suBirthday", target = "birthday")
+ @Mapping(source = "suEmail", target = "email")
+ @Mapping(source = "serviceSignature", target = "serviceSign")
+ @Mapping(source = "suAddress", target = "address")
+ public abstract UserInfoDetailVo usersToDetailInfoVo(SysUsers sysUsers);
+
+ public abstract ModifyUserDto usersToModifyUserDto(SysUsers sysUsers);
+
+ @Mapping(target = "suPhoto", source = "photo")
+ @Mapping(target = "suName", source = "name")
+ @Mapping(target = "suAliases", source = "engName")
+ @Mapping(target = "suTel", source = "telphone")
+ @Mapping(target = "suSex", source = "sex")
+ @Mapping(target = "suBirthday", source = "birthday")
+ @Mapping(target = "suEmail", source = "email")
+ @Mapping(target = "serviceSignature", source = "serviceSign")
+ @Mapping(target = "suAddress", source = "address")
+ public abstract SysUsers modifyUserDtoToUsers(ModifyUserDto modifyUserDto);
+
}
--
Gitblit v1.9.1