From 80a3f59e2d3df07805bc67e329300b8de90a5b3a Mon Sep 17 00:00:00 2001 From: buli <137736985@qq.com> Date: 星期二, 11 七月 2023 14:13:08 +0800 Subject: [PATCH] Merge branch 'LEXCommunityLiJun' into LEXUpgrade2023-Deloitte --- force-app/main/default/classes/LexConsumableOrderManageController.cls | 69 ++++++++++++++++++++-------------- 1 files changed, 40 insertions(+), 29 deletions(-) diff --git a/force-app/main/default/classes/LexConsumableOrderManageController.cls b/force-app/main/default/classes/LexConsumableOrderManageController.cls index 0f4fc14..e086bbb 100644 --- a/force-app/main/default/classes/LexConsumableOrderManageController.cls +++ b/force-app/main/default/classes/LexConsumableOrderManageController.cls @@ -56,33 +56,36 @@ List<CusCol> cols = new List<CusCol>(); for (FieldSetMember fsm : fsmList) { //add by Link - CusCol col = new CusCol(); - col.label = fsm.getLabel(); - col.fieldName = fsm.getFieldPath(); - col.hideDefaultActions = true; - // col.sortable = true; - col.wrapText = true; - if (fsm.getFieldPath() == 'Order_ForHospital__c') { - col.type = 'url'; - col.fieldName = 'hosUrl'; - TypeAttr typeAttributes1 = new TypeAttr(); - CusLable cusLabel = new CusLable(); - cusLabel.fieldName = 'hosName'; - typeAttributes1.label = cusLabel; - typeAttributes1.target = '_blank'; - col.typeAttributes = typeAttributes1; + if (fsm.getFieldPath() == 'Order_ForHospital__c' && agencyProType == 'ET') { + } else { + CusCol col = new CusCol(); + col.label = fsm.getLabel(); + col.fieldName = fsm.getFieldPath(); + col.hideDefaultActions = true; + // col.sortable = true; + col.wrapText = true; + if (fsm.getFieldPath() == 'Order_ForHospital__c') { + col.type = 'url'; + col.fieldName = 'hosUrl'; + TypeAttr typeAttributes1 = new TypeAttr(); + CusLable cusLabel = new CusLable(); + cusLabel.fieldName = 'hosName'; + typeAttributes1.label = cusLabel; + typeAttributes1.target = '_blank'; + col.typeAttributes = typeAttributes1; + } + if (fsm.getFieldPath() == 'Name') { + col.type = 'url'; + col.fieldName = 'nameUrl'; + TypeAttr typeAttributes1 = new TypeAttr(); + CusLable cusLabel = new CusLable(); + cusLabel.fieldName = 'Name'; + typeAttributes1.label = cusLabel; + typeAttributes1.target = '_blank'; + col.typeAttributes = typeAttributes1; + } + cols.add(col); } - if (fsm.getFieldPath() == 'Name') { - col.type = 'url'; - col.fieldName = 'nameUrl'; - TypeAttr typeAttributes1 = new TypeAttr(); - CusLable cusLabel = new CusLable(); - cusLabel.fieldName = 'Name'; - typeAttributes1.label = cusLabel; - typeAttributes1.target = '_blank'; - col.typeAttributes = typeAttributes1; - } - cols.add(col); //update by rentx 2020-12-22 start if (fsm.getLabel() == '鍖婚櫌' && agencyProType != null && agencyProType == 'ET') { } else { @@ -122,7 +125,11 @@ raesList = Database.query(soql); //add by rentx 2021-3-10 start //涓� hasHop 璧嬪�� 鍒ゆ柇褰撳墠缁忛攢鍟嗕笅鏄惁鏈夌壒浠峰尰闄� - List<hospitalprice__c> hopList = [SELECT id, hospital__c FROM hospitalprice__c WHERE account__c = :accountid]; + List<hospitalprice__c> hopList = [ + SELECT id, hospital__c + FROM hospitalprice__c + WHERE account__c = :accountid + ]; if (hopList == null || hopList.size() == 0) { hasHop = false; } else { @@ -140,7 +147,11 @@ for (Account acc : contractList) { dealIds.add(acc.Id); } - List<Dealer_Product__c> deList = [SELECT id FROM Dealer_Product__c WHERE Dealer_Contact__c IN :dealIds]; + List<Dealer_Product__c> deList = [ + SELECT id + FROM Dealer_Product__c + WHERE Dealer_Contact__c IN :dealIds + ]; if (deList == null || deList.size() == 0) { hasSpecial = false; } else { @@ -329,4 +340,4 @@ @AuraEnabled public String fieldName; } -} \ No newline at end of file +} -- Gitblit v1.9.1