Merge branch '追溯周报'

付煜

2022-04-12 1ec35e39bd92406c62b2ed3aa65fbaf3d411f858

Merge branch '追溯周报'

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

@@ -1119,22 +1119,37 @@
    @RemoteAction
    @AuraEnabled
    public static List<Map<String,String>> selectProductClassificationc(String select_ProductClassification){
        //fy
        List<FieldClassification__c> WarlockClassificationList;
        List<AggregateResult> WarlockClassificationList2;
        User UserProTypec = LightningUtil.loginUserId();
        if(String.isNotBlank(select_ProductClassification)){
            // WarlockClassificationList = [select id, Name , ProductClassification__c from WarlockClassification__c where ProductClassification__c =: select_ProductClassification];
            WarlockClassificationList = [select id , ProductClassification__c,WarlockClassification__c from FieldClassification__c where ProductClassification__c =: select_ProductClassification];

            if(UserProTypec.UserPro_Type__c =='ET'){
                WarlockClassificationList = [select id , ProductClassification__c,WarlockClassification__c from FieldClassification__c where ProductClassification__c =: select_ProductClassification];
            }else{
                WarlockClassificationList2 = [select count(id) sum, Category4__c from product2 where Category3__c =: select_ProductClassification and ENG_DeaerProFlag__c  = true group by Category4__c ];
            }
        }
        List<Map<String,String>> options = new List<Map<String,String>>();
        Map<String,String> space = new Map<String,String>();
        space.put('label', '');
        space.put('value', '');
        options.add(space);
        for(FieldClassification__c WarlockClassification : WarlockClassificationList){
            Map<String,String> WarlockClassificationMap = new Map<String,String>();
            WarlockClassificationMap.put('label', WarlockClassification.WarlockClassification__c);
            WarlockClassificationMap.put('value', WarlockClassification.WarlockClassification__c);
            options.add(WarlockClassificationMap);
        if(UserProTypec.UserPro_Type__c =='ET'){
            for(FieldClassification__c WarlockClassification : WarlockClassificationList){
                Map<String,String> WarlockClassificationMap = new Map<String,String>();
                WarlockClassificationMap.put('label', WarlockClassification.WarlockClassification__c);
                WarlockClassificationMap.put('value', WarlockClassification.WarlockClassification__c);
                options.add(WarlockClassificationMap);
            }
        }else{
            for(AggregateResult WarlockClassification2 : WarlockClassificationList2){
                Map<String,String> WarlockClassificationMap2 = new Map<String,String>();
                WarlockClassificationMap2.put('label', string.valueOf(WarlockClassification2.get('Category4__c')));
                WarlockClassificationMap2.put('value', string.valueOf(WarlockClassification2.get('Category4__c')));
                options.add(WarlockClassificationMap2);
            }
        }
        return options;
    } 
@@ -1167,7 +1182,8 @@
        List<FieldClassification__c> productCategoriesList;
        User UserProETENG = LightningUtil.loginUserId();
        System.debug('UserProETENG.UserPro_Type__c=============>'+UserProETENG.UserPro_Type__c);
        FieldClassification__c fi = [Select ProductCcategory__c from FieldClassification__c where ID =: select_ProductCcategory];
        System.debug('select_ProductCcategory=============>'+select_ProductCcategory);
        FieldClassification__c fi = [Select ProductCcategory__c from FieldClassification__c where ProductCcategory__c =: select_ProductCcategory limit 1];
        if(UserProETENG.UserPro_Type__c == 'ET'){
            productCategoriesList = [select id, productCategories__c,ET_ENG_classification__c,ProductCcategory__c from FieldClassification__c where ProductCcategory__c =: fi.ProductCcategory__c AND ET_ENG_classification__c =: 'ET'];
        }else{