From ead4df22dca33a867279471821ca675f91dec760 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期六, 14 五月 2022 18:44:54 +0800
Subject: [PATCH] FixIssue0514

---
 force-app/main/default/classes/ProRegisterHandler.cls |  186 ++--------------------------------------------
 1 files changed, 10 insertions(+), 176 deletions(-)

diff --git a/force-app/main/default/classes/ProRegisterHandler.cls b/force-app/main/default/classes/ProRegisterHandler.cls
index 65515f8..f290e50 100644
--- a/force-app/main/default/classes/ProRegisterHandler.cls
+++ b/force-app/main/default/classes/ProRegisterHandler.cls
@@ -98,16 +98,12 @@
 		if (UpdProMap.keySet().size() > 0)  update UpdProMap.values();
 	}
 
-	//浜у搧闄嶇被,鍙娉ㄥ唽璇佹洿鏂颁簡,灏辨鏌ヤ竴閬嶏紝閲嶆柊缁欎骇鍝佷笂鐨勭瓑绾х被鍒瓧娈佃祴鍊笺��
-	//鍙互鎵惧嚭闇�瑕佺殑Id,鐒跺悗璋冪敤鏂规硶銆�
+	//鐢ㄤ簬闄嶇被,浜у搧娉ㄥ唽璇佹洿鏂颁簡,灏辨妸浜у搧娉ㄥ唽璇佷笅鐨勪骇鍝佺殑绛夌骇绫诲埆瀛楁璧嬬┖,瑙﹀彂浜у搧鐨勮Е鍙戝櫒
 	public static void checkRegistervervaldatum(List<Product_Register__c> newList, Map<Id, Product_Register__c> newMap, List<Product_Register__c> oldList, Map<Id, Product_Register__c> oldMap) {
 		List<String> prcList = new List<String>();
 		for (Product_Register__c pr : newList) {
 			Product_Register__c oldpr = oldMap.get(pr.Id);
-			//鏈夋晥鏈熺殑濮嬩笌缁堝彉浜�,灏辨妸杩欎釜浜у搧娉ㄥ唽璇佺殑id鏀惧叆涓�涓狶ist闆嗗悎閲岄潰
-			//if (pr.ValidTo__c != oldpr.ValidTo__c || pr.ValidFrom__c != oldpr.ValidFrom__c) {
 			    prcList.add(pr.id);
-			//}
 		}
 		//鏀惧埌Map閲岋紝鐢ㄤ簬娉ㄥ唽璇佹洿鏂颁骇鍝�
 		Map<Id,Product2> prt2Map = new Map<Id,Product2>();
@@ -116,181 +112,19 @@
 		prlList = [select Product2__r.id,Product2__r.demoteer_Sap__c,Product2__r.Diedatvanink__c,Product_Register__r.MedPrdClass__c,Product_Register__r.Stelsedag__c,Product_Register__r.ValidTo__c,Product_Register__r.ValidFrom__c 
 		from Product_Register_Link__c 
         where Product_Register__r.Id in : prcList];
-        //鏌ヨ鍑轰骇鍝両D
-        List<Id> pro2IdList = new  List<Id>();
-        for (Product_Register_Link__c prl1: prlList) {
-        	pro2IdList.add(prl1.Product2__r.id);
+
+        List<ID> proIdList = new List<ID>();
+        for (Product_Register_Link__c prl: prlList) {
+        	proIdList.add(prl.Product2__r.id);
         }
-
-        List<Product_Register_Link__c> prl1List = new List<Product_Register_Link__c>();
-        prl1List = [select Product2__r.id,Product2__r.demoteer_Sap__c,Product2__r.Diedatvanink__c,Product_Register__r.Stelsedag__c,Product_Register__r.MedPrdClass__c,Product_Register__r.ValidTo__c,Product_Register__r.ValidFrom__c 
-        from Product_Register_Link__c 
-        where Product2__r.Id in : pro2IdList];
-
-        //鏍规嵁Id瀛樻斁浜у搧鎵�灞炵殑鎵�鏈夋敞鍐岃瘉涓嬬殑鍣ㄦ鍒嗙被銆�
-        Map<Id,List<String>> pro2Map = new Map<Id,List<String>>();
-        //瀛樻斁娉ㄥ唽璇佷笂鏈�鍓嶇殑缁存姢鏃�
-        Map<Id,Date> prSteMap = new Map<Id,Date>();
-        Map<Id,Date> prSte1Map = new Map<Id,Date>();
-        if (prl1List.size()>0) {
-            for (Product_Register_Link__c prl: prl1List) {
-                if (pro2Map.containsKey(prl.Product2__r.Id)) {
-                    pro2Map.get(prl.Product2__r.Id).add(prl.Product_Register__r.MedPrdClass__c);
-                }else {
-                    pro2Map.put(prl.Product2__r.Id, new List<String>());
-                    pro2Map.get(prl.Product2__r.Id).add(prl.Product_Register__r.MedPrdClass__c);
-                }
-
-                if (prl.Product_Register__r.MedPrdClass__c == '1' && prl.Product_Register__r.Stelsedag__c <> null) {
-                    if (prSteMap.containsKey(prl.Product2__r.Id)) {
-                        if (prSteMap.get(prl.Product2__r.Id) > prl.Product_Register__r.Stelsedag__c) {
-                            prSteMap.put(prl.Product2__r.Id,prl.Product_Register__r.Stelsedag__c);
-                        }
-                    }else {
-                        prSteMap.put(prl.Product2__r.Id,prl.Product_Register__r.Stelsedag__c);
-                    }
-                }
-
-                if ((prl.Product_Register__r.MedPrdClass__c == '2' || prl.Product_Register__r.MedPrdClass__c == '2') && prl.Product_Register__r.Stelsedag__c <> null) {
-                    if (prSte1Map.containsKey(prl.Product2__r.Id)) {
-                        if (prSte1Map.get(prl.Product2__r.Id) > prl.Product_Register__r.Stelsedag__c) {
-                            prSte1Map.put(prl.Product2__r.Id,prl.Product_Register__r.Stelsedag__c);
-                        }
-                    }else {
-                        prSte1Map.put(prl.Product2__r.Id,prl.Product_Register__r.Stelsedag__c);
-                    }
-                }
-            }
-        }
-        System.debug('pro2Map='+pro2Map);
-        System.debug('prSteMap='+prSteMap);
-        System.debug('prSte1Map='+prSte1Map);
-        //浜у搧Id涓庣瓑绾х被鍒�
-        Map<Id,String> prlMap = new Map<Id,String>();
-        Map<Id,String> prl1Map = new Map<Id,String>();
-        Map<Id,String> prl2Map = new Map<Id,String>();
-        List<ID> pidList = new List<ID>();
-        Date stedate;
-
-        if (pro2Map.size()>0) {
-            for (Product_Register_Link__c pr: prl1List) {
-                if (pro2Map.containsKey(pr.Product2__r.Id) && (prSteMap.containsKey(pr.Product2__r.Id) || prSte1Map.containsKey(pr.Product2__r.Id))) {
-                	stedate = prSteMap.get(pr.Product2__r.Id)==null?prSte1Map.get(pr.Product2__r.Id)==null?null:prSte1Map.get(pr.Product2__r.Id):prSte1Map.get(pr.Product2__r.Id);
-                	pidList.add(pr.Product2__r.Id);
-                    if (pr.Product2__r.demoteer_Sap__c <> null && pr.Product2__r.Diedatvanink__c <> null) {
-                    	if (pr.Product_Register__r.Stelsedag__c <> null) {
-                    	    if (pr.Product2__r.Diedatvanink__c <= stedate) {
-	                           if (pr.Product2__r.demoteer_Sap__c <= pr.Product_Register__r.ValidTo__c && pr.Product2__r.demoteer_Sap__c >= pr.Product_Register__r.ValidFrom__c
-	                                && pr.Product_Register__r.MedPrdClass__c == '2' || pr.Product_Register__r.MedPrdClass__c == '3') {
-	                                if (prlMap.get(pr.Product2__r.Id) == null) {
-	                                    prlMap.put(pr.Product2__r.Id, '浜岀被');
-	                                }else {
-	                                    String Lins = prlMap.get(pr.Product2__r.Id);
-	                                    Lins += '浜岀被';
-	                                    prlMap.put(pr.Product2__r.Id, Lins);
-	                                }
-	                            }
-	                            else if (pr.Product2__r.demoteer_Sap__c <= pr.Product_Register__r.ValidTo__c && pr.Product2__r.demoteer_Sap__c >= pr.Product_Register__r.ValidFrom__c
-	                                && (pr.Product_Register__r.MedPrdClass__c == '1')) {
-	                                    if (prlMap.get(pr.Product2__r.Id) == null) {
-	                                        prlMap.put(pr.Product2__r.Id, '涓�绫�');
-	                                    }else {
-	                                        String Lins = prlMap.get(pr.Product2__r.Id);
-	                                    Lins += '涓�绫�';
-	                                    prlMap.put(pr.Product2__r.Id, Lins);
-	                                    }
-	                            }else {
-	                                if (prlMap.get(pr.Product2__r.Id) == null) {
-	                                    prlMap.put(pr.Product2__r.Id, '闈炵洃绠�');
-	                                }else {
-	                                    String Lins = prlMap.get(pr.Product2__r.Id);
-	                                    Lins += '闈炵洃绠�';
-	                                    prlMap.put(pr.Product2__r.Id, Lins);
-	                                }
-	                            }
-	                        }else if (pr.Product2__r.Diedatvanink__c > stedate) {
-	                            if (pr.Product2__r.demoteer_Sap__c <= pr.Product_Register__r.ValidTo__c && pr.Product2__r.demoteer_Sap__c >= pr.Product_Register__r.ValidFrom__c
-	                                && pr.Product_Register__r.MedPrdClass__c == '1') {
-	                                if (prl1Map.get(pr.Product2__r.Id) == null) {
-	                                    prl1Map.put(pr.Product2__r.Id, '涓�绫�');
-	                                }else {
-	                                    String Lins = prl1Map.get(pr.Product2__r.Id);
-	                                    Lins += '涓�绫�';
-	                                    prl1Map.put(pr.Product2__r.Id, Lins);
-	                                }
-	                            }else if (pr.Product2__r.demoteer_Sap__c <= pr.Product_Register__r.ValidTo__c && pr.Product2__r.demoteer_Sap__c >= pr.Product_Register__r.ValidFrom__c
-	                                && pr.Product_Register__r.MedPrdClass__c == '2' || pr.Product_Register__r.MedPrdClass__c == '3') {
-	                                if (prl1Map.get(pr.Product2__r.Id) == null) {
-	                                    prl1Map.put(pr.Product2__r.Id, '浜岀被');
-	                                }else {
-	                                    String Lins = prl1Map.get(pr.Product2__r.Id);
-	                                    Lins += '浜岀被';
-	                                    prl1Map.put(pr.Product2__r.Id, Lins);
-	                                }
-	                            }else {
-	                                if (prlMap.get(pr.Product2__r.Id) == null) {
-	                                    prlMap.put(pr.Product2__r.Id, '闈炵洃绠�');
-	                                }else {
-	                                    String Lins = prlMap.get(pr.Product2__r.Id);
-	                                    Lins += '闈炵洃绠�';
-	                                    prlMap.put(pr.Product2__r.Id, Lins);
-	                                }
-	                            }
-	                        }
-                    	}else {
-                    		prl2Map.put(pr.Product2__r.Id, '绌�');
-                    	}
-                    }
-                }
-            }
-        }
-        System.debug('prlMap='+prlMap);
-        System.debug('prl1Map='+prl1Map);
-        System.debug('prl2Map='+prl2Map);
-
+        
         List<Product2> por2Lsit = new List<Product2>();
 	    //鏌ュ嚭浜у搧鐨刬d鍜岀瓑绾х被鍒殑瀛楁 
-	    por2Lsit = [select Id,Level_Category__c,demoteer_Sap__c,Diedatvanink__c from Product2 where Id in : pidList];
-	    if (por2Lsit.size() > 0) {
-	        for (Product2 pr2: por2Lsit) {
-	        	if (prlMap.containsKey(pr2.Id)) {
-                	if ((prlMap.get(pr2.Id).contains('浜岀被') && prlMap.get(pr2.Id).contains('涓�绫�')) || 
-	                    (!prlMap.get(pr2.Id).contains('涓�绫�') && prlMap.get(pr2.Id).contains('浜岀被'))){
-                		pr2.Level_Category__c = '浜岀被';
-	                    prt2Map.put(pr2.Id, pr2);
-	                }else if (prlMap.get(pr2.Id).contains('涓�绫�') && !prlMap.get(pr2.Id).contains('浜岀被')) {
-	                	pr2.Level_Category__c = '涓�绫�';
-	                    prt2Map.put(pr2.Id, pr2);
-	                }else if (prlMap.get(pr2.Id).contains('闈炵洃绠�') && !prl2Map.containsKey(pr2.Id)) {
-	                    pr2.Level_Category__c = '闈炵洃绠�';
-	                    prt2Map.put(pr2.Id, pr2);
-	                }else {
-	                	pr2.Level_Category__c = null;
-	                    prt2Map.put(pr2.Id, pr2);
-	                }
-	            }
-	            if (prl1Map.containsKey(pr2.Id)) {
-	                if (prl1Map.get(pr2.Id).contains('涓�绫�')) {
-	                    pr2.Level_Category__c = '涓�绫�';
-	                    prt2Map.put(pr2.Id, pr2);
-	                }else if (prl1Map.get(pr2.Id).contains('浜岀被') && !prl1Map.get(pr2.Id).contains('涓�绫�')) {
-	                    pr2.Level_Category__c = '浜岀被';
-	                    prt2Map.put(pr2.Id, pr2);
-	                }else if (prl1Map.get(pr2.Id).contains('闈炵洃绠�') && !prl2Map.containsKey(pr2.Id)) {
-	                    pr2.Level_Category__c = '闈炵洃绠�';
-	                    prt2Map.put(pr2.Id, pr2);
-	                }else {
-	                	pr2.Level_Category__c = null;
-	                    prt2Map.put(pr2.Id, pr2);
-	                }
-	            }
-	            if (pr2.demoteer_Sap__c == null || pr2.Diedatvanink__c == null) {
-                	pr2.Level_Category__c = null;
-                	prt2Map.put(pr2.Id, pr2);
-            	}
-	    	}
+	    por2Lsit = [select Id,Level_Category__c from Product2 where Id in : proIdList];
+	    for (Product2 pro: por2Lsit) {
+	    	pro.Level_Category__c = null;
+	    	prt2Map.put(pro.Id, pro);
 	    }
-	    
 	    System.debug('prt2Map='+prt2Map);
         if (prt2Map.size() > 0) {
            update prt2Map.values(); 

--
Gitblit v1.9.1