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/SysBeauticianStateMapper.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/mapper/SysBeauticianStateMapper.java b/zq-erp/src/main/java/com/matrix/system/app/mapper/SysBeauticianStateMapper.java
index 571a397..fc9f600 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/mapper/SysBeauticianStateMapper.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/mapper/SysBeauticianStateMapper.java
@@ -1,8 +1,10 @@
package com.matrix.system.app.mapper;
import com.matrix.system.app.dto.CreateServiceOrderItemDto;
+import com.matrix.system.app.vo.ServiceOrderDetailItemVo;
import com.matrix.system.hive.bean.SysBeauticianState;
import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import java.util.List;
@@ -20,4 +22,13 @@
public abstract List<SysBeauticianState> orderItmesVoToEntityList(List<CreateServiceOrderItemDto> dtoList);
+ @Mapping(source = "projUse.price", target = "price")
+ @Mapping(source = "projInfo.name", target = "name")
+ @Mapping(source = "projInfo.timeLength", target = "timeLength")
+ @Mapping(source = "beautiStaffInfo.suName", target = "beautyName")
+ @Mapping(source = "extract", target = "commission")
+ public abstract ServiceOrderDetailItemVo entityToDetailItemVo(SysBeauticianState sysBeauticianState);
+
+ public abstract List<ServiceOrderDetailItemVo> entitiesToDetailItemsVo(List<SysBeauticianState> list);
+
}
--
Gitblit v1.9.1