Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 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);

}