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 | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/CheckAllOlympusAssetController.cls b/force-app/main/default/classes/CheckAllOlympusAssetController.cls
index 3a70581..9579103 100644
--- a/force-app/main/default/classes/CheckAllOlympusAssetController.cls
+++ b/force-app/main/default/classes/CheckAllOlympusAssetController.cls
@@ -424,6 +424,7 @@
if (beipinCunFangDi=='骞垮窞 澶囧搧涓績' || beipinCunFangDi=='鍖椾含 澶囧搧涓績' || beipinCunFangDi=='涓婃捣 澶囧搧涓績') {
angecylookrole =true;
}
+ System.debug('angecylookrole===' + angecylookrole);
setAssetFieldSetInfo();//20210628 1650 you 鎸釜浣嶇疆
if (UserInfo.getProfileId() == System.Label.ProfileId_SystemAdmin || System.Label.ProfileId_EquCenAdmin.contains(UserInfo.getProfileId())) {
internalAssetLocationLogin = FixtureUtil.bieCunFangDiOpsMap.get('澶囧搧绠＄悊涓績')[0].getValue(); // SelectOption('All', '--鍏ㄩ儴--')
@@ -758,6 +759,7 @@
}
System.debug('oldAssetInfoList===' + oldAssetInfoList);
checkedAssetInfoNum = oldAssetInfoList.size();
+ System.debug('oldAssetInfoListSize===' + oldAssetInfoList.size());
allAssetInfoList.clear();
totalFixDataNum = oldAssetInfoList.size(); // 鎵撳嬀鍥哄畾鏁版嵁鏁伴噺
@@ -968,6 +970,7 @@
}
System.debug('currPage===' + currPage);
System.debug('totalPage===' + totalPage);
+ System.debug('selctRecordNum===' + selctRecordNum);
if (selRecordOption != NONE) {
// selRecordOption = String.valueOf(Integer.valueOf(selRecordOption) + checkedAssetInfoNum);
if (currPage == 1) {
@@ -977,7 +980,14 @@
soqlAsset += ' limit ' + selRecordOption + ' offset ' + String.valueOf((currPage - 1) * selctRecordNum - checkedAssetInfoNum);
System.debug('Last page;');
} else {
- soqlAsset += ' limit ' + selRecordOption + ' offset ' + String.valueOf((currPage - 1) * selctRecordNum - checkedAssetInfoNum);
+ // 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
}
}
// 鏈�缁堟绱㈢粨鏋�
@@ -1208,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));
@@ -1270,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);
}
@@ -1309,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] != '') {
@@ -1376,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