fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 force-app/main/default/classes/LexConsumableAccountSOQL.cls

@@ -1,4 +1,32 @@
public with sharing class LexConsumableAccountSOQL {
<<<<<<< HEAD
    public static AggregateResult[] getAccountBySales(Datetime thisDatetime, Datetime nextDatetime) {
        AggregateResult[] arList = new List<AggregateResult>(
            [
                SELECT
                    Consumable_order__r.Order_ForHospital__c,
                    Consumable_order__r.Order_ForHospital__r.name hospitalName,
                    sum(Sale_amount__c) thisAmount
                FROM Consumable_Orderdetails__c
                WHERE CreatedDate >= :thisDatetime AND CreatedDate < :nextDatetime AND Consumable_order__r.Order_ForHospital__r.name != ''
                GROUP BY Consumable_order__r.Order_ForHospital__c, Consumable_order__r.Order_ForHospital__r.name
                ORDER BY sum(Sale_amount__c) DESC
                LIMIT 10
            ]
        );
        return arList;
    }

    public static AggregateResult[] getAccountTotalSales(Datetime thisDatetime, Datetime nextDatetime) {
        AggregateResult[] saleAmountList = [
            SELECT sum(Sale_amount__c) saleAmount
            FROM Consumable_Orderdetails__c
            WHERE CreatedDate >= :thisDatetime AND CreatedDate < :nextDatetime AND Consumable_order__r.Order_ForHospital__r.name != ''
        ];
        return saleAmountList;
    }
}
=======
    public static AggregateResult[] getAccountBySales(Datetime thisDatetime ,Datetime nextDatetime){
        AggregateResult[] arList = new List<AggregateResult>([
            SELECT Consumable_order__r.Order_ForHospital__c,Consumable_order__r.Order_ForHospital__r.name hospitalName,
@@ -27,4 +55,5 @@
    }

  
}
}
>>>>>>> LEXCommunityLiJun