From fd9df05c48c09b4d7f39a3b401882bda226dedea Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期二, 31 十月 2023 20:38:18 +0800
Subject: [PATCH] 近期修改
---
force-app/main/default/classes/CheckAllOlympusAssetController.cls | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/CheckAllOlympusAssetController.cls b/force-app/main/default/classes/CheckAllOlympusAssetController.cls
index 692a3f7..9579103 100644
--- a/force-app/main/default/classes/CheckAllOlympusAssetController.cls
+++ b/force-app/main/default/classes/CheckAllOlympusAssetController.cls
@@ -980,12 +980,14 @@
soqlAsset += ' limit ' + selRecordOption + ' offset ' + String.valueOf((currPage - 1) * selctRecordNum - checkedAssetInfoNum);
System.debug('Last page;');
} else {
+ // 20231103 Sit淇敼鍒嗛〉閿欒 Start
+ // soqlAsset += ' limit ' + selRecordOption + ' offset ' + String.valueOf((currPage - 1) * selctRecordNum - checkedAssetInfoNum);
if(oldAssetInfoList.size() > 10 && currPage == 2){
soqlAsset += ' limit ' + selRecordOption + ' offset ' + String.valueOf((currPage) * selctRecordNum - checkedAssetInfoNum);
}else{
soqlAsset += ' limit ' + selRecordOption + ' offset ' + String.valueOf((currPage - 1) * selctRecordNum - checkedAssetInfoNum);
}
-
+ // 20231103 Sit淇敼鍒嗛〉閿欒 End
}
}
// 鏈�缁堟绱㈢粨鏋�
@@ -1216,9 +1218,10 @@
public Date stringToDate(String dateStr) { // Fri Jan 18 00:00:00 GMT 2019
//System.debug('dateStr=====' + dateStr);
+ // 20231103 闄堜含姝� sit闂淇敼 Start
dateStr = dateStr.split(' ')[0];
return Date.valueOf(dateStr.replaceAll('/','-'));
-
+ // 20231103 闄堜含姝� sit闂淇敼 End
//String monthStr = dateStr.substring(4,7);
//Integer dayStr = Integer.ValueOf(dateStr.substring(8,10));
//Integer yearStr = Integer.ValueOf(dateStr.substring(24,28));
@@ -1278,11 +1281,13 @@
}
}
System.debug('333333');
+ // 20231103 闄堜含姝� sit闂淇敼 Start
// 妫�绱SV涓殑ID妫�绱sset鑾峰緱List<Asset>
// try {
if (allApiList.contains('Id')) {
allApiList.remove(0);
}
+ // 20231103 闄堜含姝� sit闂淇敼 End
if (importApiList.contains('Id')) {
importApiList.remove(0);
}
@@ -1317,11 +1322,12 @@
if (!queryAssetFieldResult.isCalculated()) {
if (queryAssetFieldResult.getType() == Schema.DisplayType.Date) {
if (tempCsvBody[i][j+1] != '') {
+ // 20231103 闄堜含姝� sit闂淇敼 Start
String s = tempCsvBody[i][j+1].substring(0,1);
if(s == '2'){
tempAsset.put(importApiList[j], stringToDate(tempCsvBody[i][j+1]));
}
-
+ // 20231103 闄堜含姝� sit闂淇敼 End
}
} else if (queryAssetFieldResult.getType() == Schema.DisplayType.Boolean) {
if (tempCsvBody[i][j+1] != '') {
@@ -1384,11 +1390,13 @@
ApexPages.Message errorMessage = new ApexPages.Message(ApexPages.severity.INFO, importSuccessfulMsg);
ApexPages.addMessage(errorMessage);
}
+ // 20231103 闄堜含姝� sit闂淇敼 Start
// } catch (Exception e) {
// System.debug('1234 ' + e);
// ApexPages.Message errorMessage = new ApexPages.Message(ApexPages.severity.ERROR, '瀵煎叆杩囩▼鍑虹幇閿欒锛屽鍏ユ枃浠朵腑鍙兘瀛樺湪Fieldset涓笉瀛樺湪鐨勫垪鍚嶏紝璇锋鏌SV鏂囦欢銆�');
// ApexPages.addMessage(errorMessage);
// }
+ // 20231103 闄堜含姝� sit闂淇敼 End
}
--
Gitblit v1.9.1