blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
buli
2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e 
 force-app/main/default/classes/LexConsumableController.cls


@@ -207,15 +207,7 @@


        ESetId = esetId;


        methodType = type;


        if (String.isBlank(methodType) && String.isNotBlank(ESetId)) {


<<<<<<< HEAD


            List<Consumable_order__c> oclist = [


                SELECT orderPattern__c


                FROM Consumable_order__c


                WHERE id = :ESetid


            ];


=======


            List<Consumable_order__c> oclist = [SELECT orderPattern__c FROM Consumable_order__c WHERE id = :ESetid];


>>>>>>> LEXCommunityLiJun


            methodType = oclist.get(0).orderPattern__c;


        }


        statusEdit = keywordStr;


@@ -240,15 +232,7 @@


            userId = UserInfo.getUserId();


            List<user> Useracc = new List<user>();


            //lt 20230517 安徽两票制 add ,OSHFLG__c


<<<<<<< HEAD


            Useracc = [


                SELECT accountid, Work_Location__c, UserPro_Type__c, OSHFLG__c


                FROM user


                WHERE id = :userId


            ];


=======


            Useracc = [SELECT accountid, Work_Location__c, UserPro_Type__c, OSHFLG__c FROM user WHERE id = :userId];


>>>>>>> LEXCommunityLiJun


            accountid = Useracc[0].accountid;


            userWorkLocation = Useracc[0].Work_Location__c;


            agencyProType = Useracc[0].UserPro_Type__c;


@@ -567,15 +551,7 @@


                //         attachmentRecoeds.add(new ConsumableorderdetailsInfo(attachmentinfo[i]));


                //     }


                // }


<<<<<<< HEAD


                List<ContentDocumentLink> links = [


                    SELECT Id, ContentDocumentId


                    FROM ContentDocumentLink


                    WHERE LinkedEntityId = :ESetId


                ];


=======


                List<ContentDocumentLink> links = [SELECT Id, ContentDocumentId FROM ContentDocumentLink WHERE LinkedEntityId = :ESetId];


>>>>>>> LEXCommunityLiJun


                if (links != null && links.size() > 0) {


                    List<String> documentIds = new List<String>();


                    for (ContentDocumentLink link : links) {


@@ -1503,15 +1479,7 @@


        ESetId = eSetidStr;


        try {


            statusEdit = 'Redirect';


<<<<<<< HEAD


            List<Consumable_order__c> oclist = [


                SELECT orderPattern__c


                FROM Consumable_order__c


                WHERE id = :ESetid


            ];


=======


            List<Consumable_order__c> oclist = [SELECT orderPattern__c FROM Consumable_order__c WHERE id = :ESetid];


>>>>>>> LEXCommunityLiJun


            String url = '/lexconsumable?ESetid=' + ESetid + '&KeyWords=' + statusEdit + '&type=' + oclist.get(0).orderPattern__c;


            results.result = 'Success';


            results.url = url;


@@ -1531,15 +1499,7 @@


        returnOrder = true;


        try {


            statusEdit = 'Redirect';


<<<<<<< HEAD


            List<Consumable_order__c> oclist = [


                SELECT orderPattern__c


                FROM Consumable_order__c


                WHERE id = :ESetid


            ];


=======


            List<Consumable_order__c> oclist = [SELECT orderPattern__c FROM Consumable_order__c WHERE id = :ESetid];


>>>>>>> LEXCommunityLiJun


            String url = '/lexconsumable?ESetid=' + ESetid + '&KeyWords=' + statusEdit + '&type=' + oclist.get(0).orderPattern__c;


            results.result = 'Success';


            results.url = url;


@@ -1563,15 +1523,7 @@


            cv.VersionData = EncodingUtil.base64Decode(base64Data);


            cv.IsMajorVersion = true;


            insert cv;


<<<<<<< HEAD


            Consumable_order__c c = [


                SELECT Id


                FROM Consumable_order__c


                WHERE Id = :pId


            ];


=======


            Consumable_order__c c = [SELECT Id FROM Consumable_order__c WHERE Id = :pId];


>>>>>>> LEXCommunityLiJun


            c.Consumable_pdf_insert_day__c = Date.today();


            update c;


            results.result = 'Success';


@@ -1936,15 +1888,7 @@


                    p.orderPattern__c = methodType;


                }


                insert p;


<<<<<<< HEAD


                List<Consumable_order__c> Consumable_order = [


                    SELECT Name, orderPattern__c


                    FROM Consumable_order__c


                    WHERE id = :p.id


                ];


=======


                List<Consumable_order__c> Consumable_order = [SELECT Name, orderPattern__c FROM Consumable_order__c WHERE id = :p.id];


>>>>>>> LEXCommunityLiJun


                for (ConsumableorderdetailsInfo ass : consumableorderdetailsRecordsview) {


                    Roll = Roll + 1;


                    if (ass.check == true) {


@@ -2037,15 +1981,7 @@


                    p.Offers_Price__c = bargainPrice;


                }


                update p;


<<<<<<< HEAD


                List<Consumable_order__c> Consumable_order = [


                    SELECT Name, orderPattern__c


                    FROM Consumable_order__c


                    WHERE id = :p.id


                ];


=======


                List<Consumable_order__c> Consumable_order = [SELECT Name, orderPattern__c FROM Consumable_order__c WHERE id = :p.id];


>>>>>>> LEXCommunityLiJun


                List<Consumable_Orderdetails__c> qs = new List<Consumable_Orderdetails__c>();


                qs = [


                    SELECT Id


@@ -2131,31 +2067,6 @@


    public static Results deleteAtt(String contentVersionId, String cocId) {


        Results results = new Results();


        try {


<<<<<<< HEAD


            List<ContentVersion> cvInfo = [


                SELECT Id


                FROM ContentVersion


                WHERE FirstPublishLocationId = :cocId


            ];


            ContentVersion conVersion = [


                SELECT ContentDocumentId


                FROM ContentVersion


                WHERE Id = :contentVersionId


            ];


            String contentDocumentId = conVersion.ContentDocumentId;


            ContentDocument conDocument = [


                SELECT Id


                FROM ContentDocument


                WHERE Id = :contentDocumentId


            ];


            delete conDocument;


            if (cvInfo.size() <= 1) {


                Consumable_order__c c = [


                    SELECT Id


                    FROM Consumable_order__c


                    WHERE Id = :cocId


                ];


=======


            List<ContentVersion> cvInfo = [SELECT Id FROM ContentVersion WHERE FirstPublishLocationId = :cocId];


            ContentVersion conVersion = [SELECT ContentDocumentId FROM ContentVersion WHERE Id = :contentVersionId];


            String contentDocumentId = conVersion.ContentDocumentId;


@@ -2163,7 +2074,6 @@


            delete conDocument;


            if (cvInfo.size() <= 1) {


                Consumable_order__c c = [SELECT Id FROM Consumable_order__c WHERE Id = :cocId];


>>>>>>> LEXCommunityLiJun


                c.Consumable_pdf_insert_day__c = null;


                update c;


            }


@@ -2402,8 +2312,4 @@


        @AuraEnabled


        public String value;


    }


<<<<<<< HEAD


}


=======


}


>>>>>>> LEXCommunityLiJun