Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

 zq-erp/src/main/java/com/matrix/system/hive/dto/AchieveNewStatisticsDto.java

New file
@@ -0,0 +1,45 @@
package com.matrix.system.hive.dto;

import com.google.common.base.CaseFormat;
import com.matrix.core.pojo.BasePageQueryDto;
import com.matrix.core.tools.StringUtils;
import lombok.Data;

@Data
public class AchieveNewStatisticsDto extends BasePageQueryDto {

    //规则名称
    String achieveRuleId;


    //业绩归属人id
    String staffName;


    //门店名称
    Long shopId;

    //公司id
    Long companyId;

    //订单类型
    String orderType;

    String beginTimeStr;

    String endTimeStr;

    @Override
    public void setSort(String sort) {
        if(StringUtils.isNotBlank(sort)){
            if ("ruleName".equals(sort)) {
                super.setSort("u.name");
            } else {
                super.setSort(CaseFormat.LOWER_CAMEL.to
                        (CaseFormat.LOWER_UNDERSCORE, sort));
            }
        }else{
            super.setSort(sort);
        }
    }
}