From e14d6d0619330cad423f06493e3aa2371faa2a8f Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期六, 09 九月 2023 14:02:23 +0800
Subject: [PATCH] Sit期间修改

---
 force-app/main/default/classes/CheckAllOlympusAssetController.cls |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/force-app/main/default/classes/CheckAllOlympusAssetController.cls b/force-app/main/default/classes/CheckAllOlympusAssetController.cls
index 1b8dc8c..3a70581 100644
--- a/force-app/main/default/classes/CheckAllOlympusAssetController.cls
+++ b/force-app/main/default/classes/CheckAllOlympusAssetController.cls
@@ -1208,7 +1208,9 @@
 
     public Date stringToDate(String dateStr) {  // Fri Jan 18 00:00:00 GMT 2019
         //System.debug('dateStr=====' + dateStr);
-        return Date.valueOf(dateStr);
+        dateStr = dateStr.split(' ')[0];
+        return Date.valueOf(dateStr.replaceAll('/','-'));
+
         //String monthStr = dateStr.substring(4,7);
         //Integer dayStr = Integer.ValueOf(dateStr.substring(8,10));
         //Integer yearStr = Integer.ValueOf(dateStr.substring(24,28));
@@ -1269,11 +1271,11 @@
         }
         System.debug('333333');
         // 妫�绱SV涓殑ID妫�绱sset鑾峰緱List<Asset>
-        try {
+        // try {
             if (allApiList.contains('Id')) {
                 allApiList.remove(0);
             }
-            if (importApiList.contains('Id锛堜笉鍙慨鏀癸級')) {
+            if (importApiList.contains('Id')) {
                 importApiList.remove(0);
             }
             List<String> notIncludeApiList = new List<String>();
@@ -1307,7 +1309,11 @@
                     if (!queryAssetFieldResult.isCalculated()) {
                         if (queryAssetFieldResult.getType() == Schema.DisplayType.Date) {
                             if (tempCsvBody[i][j+1] != '') {
-                                tempAsset.put(importApiList[j], stringToDate(tempCsvBody[i][j+1]));
+                                String s = tempCsvBody[i][j+1].substring(0,1);
+                                if(s == '2'){
+                                    tempAsset.put(importApiList[j], stringToDate(tempCsvBody[i][j+1]));
+                                }
+                                
                             }
                         } else if (queryAssetFieldResult.getType() == Schema.DisplayType.Boolean) {
                             if (tempCsvBody[i][j+1] != '') {
@@ -1370,11 +1376,11 @@
                 ApexPages.Message errorMessage = new ApexPages.Message(ApexPages.severity.INFO, importSuccessfulMsg);
                 ApexPages.addMessage(errorMessage);
             }
-        } catch (Exception e) {
-            System.debug('1234 ' + e);
-            ApexPages.Message errorMessage = new ApexPages.Message(ApexPages.severity.ERROR, '瀵煎叆杩囩▼鍑虹幇閿欒锛屽鍏ユ枃浠朵腑鍙兘瀛樺湪Fieldset涓笉瀛樺湪鐨勫垪鍚嶏紝璇锋鏌SV鏂囦欢銆�');
-            ApexPages.addMessage(errorMessage);
-        }
+        // } catch (Exception e) {
+        //     System.debug('1234 ' + e);
+        //     ApexPages.Message errorMessage = new ApexPages.Message(ApexPages.severity.ERROR, '瀵煎叆杩囩▼鍑虹幇閿欒锛屽鍏ユ枃浠朵腑鍙兘瀛樺湪Fieldset涓笉瀛樺湪鐨勫垪鍚嶏紝璇锋鏌SV鏂囦欢銆�');
+        //     ApexPages.addMessage(errorMessage);
+        // }
 
     }
 

--
Gitblit v1.9.1