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 | 47 ++++++++++++++++-------------------------------
1 files changed, 16 insertions(+), 31 deletions(-)
diff --git a/force-app/main/default/classes/CheckAllOlympusAssetController.cls b/force-app/main/default/classes/CheckAllOlympusAssetController.cls
index 673ae29..3a70581 100644
--- a/force-app/main/default/classes/CheckAllOlympusAssetController.cls
+++ b/force-app/main/default/classes/CheckAllOlympusAssetController.cls
@@ -1,7 +1,7 @@
public with sharing class CheckAllOlympusAssetController {
public static Asset StaticAssetQuertResult;
// 鎸夐挳鍖哄煙
- public String assertQueryCondition {get; set;}
+ public String assertQueryCondition {get; private set;}
public Boolean allBlueFlag {get; private set;} // 鏌ョ湅鍏ㄩ儴淇濇湁璁惧钃濊壊鎸夐挳Flag
public Boolean consumableBlueFlag {get; private set;} // 鏌ョ湅鍦ㄥ簱鐨勪繚鏈夎澶囪摑鑹叉寜閽瓼lag
public Boolean lendingBlueFlag {get; private set;} // 鏌ョ湅鍑哄�熶腑淇濇湁璁惧钃濊壊鎸夐挳Flag
@@ -214,27 +214,6 @@
daysToExpiredOpts.add(new SelectOption('14', '涓ゅ懆鍐呭埌鏈�'));
}
return daysToExpiredOpts;
- }
- set;
- }
-
- //chenjingwu 2023.8.2
- //璁惧鐘舵��
- public List<SelectOption> assertQueryConditionOpts {
- get {
- if(assertQueryConditionOpts == null){
- assertQueryConditionOpts = new List<SelectOption>();
- assertQueryConditionOpts.add(new SelectOption('all', '--鏃�--'));
- assertQueryConditionOpts.add(new SelectOption('consumable', '鏈夋晥搴撳瓨'));
- assertQueryConditionOpts.add(new SelectOption('lending', '鍊熷嚭鍒嗛厤鏁�'));
- assertQueryConditionOpts.add(new SelectOption('repairing', '淇悊涓�'));
- assertQueryConditionOpts.add(new SelectOption('scrapping', '寰呮姤搴�'));
- assertQueryConditionOpts.add(new SelectOption('scrapped', '宸叉姤搴�'));
- assertQueryConditionOpts.add(new SelectOption('consumed', '宸叉秷鑰�'));
- assertQueryConditionOpts.add(new SelectOption('soonExpired', '鍗冲皢鍒版湡'));
- assertQueryConditionOpts.add(new SelectOption('expired', '宸茶繃鏈�'));
- }
- return assertQueryConditionOpts;
}
set;
}
@@ -1229,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));
@@ -1290,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>();
@@ -1328,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] != '') {
@@ -1391,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