From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新

---
 force-app/main/default/classes/SetPersonalTargetController.cls |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/force-app/main/default/classes/SetPersonalTargetController.cls b/force-app/main/default/classes/SetPersonalTargetController.cls
index 1e37e85..fd2a244 100644
--- a/force-app/main/default/classes/SetPersonalTargetController.cls
+++ b/force-app/main/default/classes/SetPersonalTargetController.cls
@@ -435,8 +435,9 @@
                         String sf = csvRecordData[1].replace(' ', '');
                         String dandang = csvRecordData[3].replace(' ', '');
                         String zw = csvRecordData[4].replace(' ', '');
-                        UserInfoList.add(bu + sf + dandang + zw);
-                        szMap.put(bu + sf + dandang + zw, csvRecordData);
+                        String key_flg = (bu + sf + dandang + zw).replaceAll('"', '');
+                        UserInfoList.add(key_flg);
+                        szMap.put(key_flg, csvRecordData);
                         sfs.add(sf);//鎶婄渷浠芥斁杩涘幓
                         bus.add(bu);//鏈儴
                         zws.add(zw);//鑱屼綅
@@ -486,30 +487,30 @@
                     List<String> csvRecordData = szMap.get(key);
                     Amount_Major_Product__c upsertAMP = new Amount_Major_Product__c();
                     //鑾峰彇瀵煎叆鏁伴噺
-                    Decimal GI_Amount = String.isNotBlank(csvRecordData[GI_Number]) ? Decimal.valueof(csvRecordData[GI_Number]) : 0.00;
+                    Decimal GI_Amount = String.isNotBlank(csvRecordData[GI_Number]) && String.isNotBlank(csvRecordData[GI_Number].replaceAll('"', '')) ? Decimal.valueof(csvRecordData[GI_Number].replaceAll('"', '')) : 0.00;
                      
                     DataSplicing(GI_Amount,userid + '_GI',Amount_Major_ProductMap1,userinfors);
                     
-                    Decimal ET_Amount = String.isNotBlank(csvRecordData[ET_Number]) ? Decimal.valueOf(csvRecordData[ET_Number]) : 0.00;
+                    Decimal ET_Amount = String.isNotBlank(csvRecordData[ET_Number]) && String.isNotBlank(csvRecordData[ET_Number].replaceAll('"', '')) ? Decimal.valueOf(csvRecordData[ET_Number].replaceAll('"', '')) : 0.00;
                     DataSplicing(ET_Amount,userid + '_ET',Amount_Major_ProductMap1,userinfors);
                     
-                    Decimal BF_Amount = String.isNotBlank(csvRecordData[BF_Number]) ? Decimal.valueOf(csvRecordData[BF_Number]) : 0.00;
+                    Decimal BF_Amount = String.isNotBlank(csvRecordData[BF_Number]) && String.isNotBlank(csvRecordData[BF_Number].replaceAll('"', '')) ? Decimal.valueOf(csvRecordData[BF_Number].replaceAll('"', '')) : 0.00;
                     DataSplicing(BF_Amount,userid + '_BF',Amount_Major_ProductMap1,userinfors);
                     
-                    Decimal GS_Amount = String.isNotBlank(csvRecordData[GS_Number]) ? Decimal.valueOf(csvRecordData[GS_Number]) : 0.00;
+                    Decimal GS_Amount = String.isNotBlank(csvRecordData[GS_Number]) && String.isNotBlank(csvRecordData[GS_Number].replaceAll('"', '')) ? Decimal.valueOf(csvRecordData[GS_Number].replaceAll('"', '')) : 0.00;
                     DataSplicing(GS_Amount,userid + '_GS',Amount_Major_ProductMap1,userinfors);
                    
-                    Decimal URO_Amount = String.isNotBlank(csvRecordData[URO_Number]) ? Decimal.valueOf(csvRecordData[URO_Number]) : 0.00;
+                    Decimal URO_Amount = String.isNotBlank(csvRecordData[URO_Number]) && String.isNotBlank(csvRecordData[URO_Number].replaceAll('"', '')) ? Decimal.valueOf(csvRecordData[URO_Number].replaceAll('"', '')) : 0.00;
                     DataSplicing(URO_Amount,userid + '_URO',Amount_Major_ProductMap1,userinfors);
                     
-                    Decimal GYN_Amount = String.isNotBlank(csvRecordData[GYN_Number]) ? Decimal.valueOf(csvRecordData[GYN_Number]) : 0.00;
+                    Decimal GYN_Amount = String.isNotBlank(csvRecordData[GYN_Number]) && String.isNotBlank(csvRecordData[GYN_Number].replaceAll('"', '')) ? Decimal.valueOf(csvRecordData[GYN_Number].replaceAll('"', '')) : 0.00;
                     DataSplicing(GYN_Amount,userid + '_GYN',Amount_Major_ProductMap1,userinfors);
                    
-                    Decimal ENT_Amount = String.isNotBlank(csvRecordData[ENT_Number]) ? Decimal.valueOf(csvRecordData[ENT_Number]) : 0.00;
+                    Decimal ENT_Amount = String.isNotBlank(csvRecordData[ENT_Number]) && String.isNotBlank(csvRecordData[ENT_Number].replaceAll('"', '')) ? Decimal.valueOf(csvRecordData[ENT_Number].replaceAll('"', '')) : 0.00;
                     DataSplicing(ENT_Amount,userid + '_ENT',Amount_Major_ProductMap1,userinfors);
                     system.debug('ENG_Number--->'+csvRecordData[ENG_Number]);
                     //鍥犱负鏈�鍚庝竴鍒楁暟鎹湁绌烘牸锛屾墍浠ュ姞.trim()
-                    Decimal ENG_Amount = String.isNotBlank(csvRecordData[ENG_Number]) ? Decimal.valueOf(csvRecordData[ENG_Number].trim()) : 0.00;
+                    Decimal ENG_Amount = String.isNotBlank(csvRecordData[ENG_Number]) && String.isNotBlank(csvRecordData[ENG_Number].replaceAll('"', ''))? Decimal.valueOf(csvRecordData[ENG_Number].replaceAll('"', '').trim()) : 0.00;
                     // Decimal.valueOf(String str)
                     DataSplicing(ENG_Amount,userid + '_ENG',Amount_Major_ProductMap1,userinfors);
                     
@@ -658,6 +659,7 @@
         ref.setRedirect(true);
         return ref;
     }
+    /** 20220613 WLIG-CER9NQ you 椤甸潰涓嬁鎺夋敼鎴恇atch鎵ц
     // 2020/06/05 SWAG-BQ7CM9 鐐瑰嚮鏇存柊鎸夐挳 by ljh
     public Pagereference UpdateBtn() {
         system.debug('=====UpdateBtn-1');
@@ -670,7 +672,7 @@
         }
         return null;
     }
-
+    **/
     // 鐐瑰嚮杩斿洖鎸夐挳
     public Pagereference backBtn() {
         // HOME銇埢銈�

--
Gitblit v1.9.1