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/NFM608Rest.cls | 68 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/classes/NFM608Rest.cls b/force-app/main/default/classes/NFM608Rest.cls
index 35afcaa..545e6be 100644
--- a/force-app/main/default/classes/NFM608Rest.cls
+++ b/force-app/main/default/classes/NFM608Rest.cls
@@ -54,11 +54,25 @@
main(rowData_Id);
}
global static void main(String rowData_Id) {
+
+ Map<String, String> transferMap = new Map<String, String>();
+ List<BatchIF_Transfer__c> transferList = [select Table__c,
+ Column__c,
+ External_value__c,
+ Internal_value__c
+ from BatchIF_Transfer__c
+ where Dropped_Flag__c = false
+ and (Table__c = 'Event__c')
+ ];
+ for (BatchIF_Transfer__c t : transferList) {
+ transferMap.put(t.Column__c + t.External_value__c, t.Internal_value__c);
+ }
+
BatchIF_Log__c rowData = [Select Id, Name, Log__c, ErrorLog__c, Log2__c, Log3__c, Log4__c, Log5__c, Log6__c, Log7__c, Log8__c, Log9__c, Log10__c, Log11__c, Log12__c, MessageGroupNumber__c, retry_cnt__c from BatchIF_Log__c where RowDataFlg__c = true and Id =: rowData_Id];
- String logstr = rowData.MessageGroupNumber__c + ' start\n';
+ String logstr = rowData.Name + ' start\n';//MessageGroupNumber__c
BatchIF_Log__c iflog = new BatchIF_Log__c();
iflog.Type__c = LOG_TYPE;
- iflog.MessageGroupNumber__c = rowData.MessageGroupNumber__c;
+ iflog.MessageGroupNumber__c = rowData.Name;//rowData.MessageGroupNumber__c;
iflog.Log__c = logstr;
iflog.ErrorLog__c = '';
insert iflog;
@@ -69,7 +83,7 @@
}
Savepoint sp = Database.setSavepoint();
try {
-
+ rowData.retry_cnt__c = 0; //蹇呭姞
// 蹇呭～瀛楁楠岃瘉 Start
String dataComplete = verify(ged);
// 蹇呭～瀛楁楠岃瘉 End
@@ -91,15 +105,45 @@
// 鑾峰彇绉戝
Account departmentAccount = getdepartmentAccount(ged.departmentCd);
if (departmentAccount == null) {
- logstr += '瀹㈡埛 [ ' + ged.departmentCd + ' ] 涓嶅瓨鍦ㄦ垨宸叉棤鏁堬紝姝ゆ潯鏁版嵁璺宠繃涓嶆墽琛孿n';
+ // 20230109 ljh start
+ // logstr += '瀹㈡埛 [ ' + ged.departmentCd + ' ] 涓嶅瓨鍦ㄦ垨宸叉棤鏁堬紝姝ゆ潯鏁版嵁璺宠繃涓嶆墽琛孿n';
+ logstr += '[ '+ged.replyID+' ]'+'瀹㈡埛 [ ' + ged.departmentCd + ' ] 涓嶅瓨鍦ㄦ垨宸叉棤鏁堬紝姝ゆ潯鏁版嵁璺宠繃涓嶆墽琛孿n';
+ // 20230109 ljh end
return;
}
String strType = getVisitType(ged.visitDistinction);
if (String.isBlank(strType)) {
- logstr += '鎷滆鍖哄垎 [ ' + ged.visitDistinction + ' ]鏃犳晥锛屾鏉℃暟鎹烦杩囦笉鎵ц \n';
+ // 20230109 ljh start
+ // logstr += '鎷滆鍖哄垎 [ ' + ged.visitDistinction + ' ]鏃犳晥锛屾鏉℃暟鎹烦杩囦笉鎵ц \n';
+ logstr += '[ '+ged.replyID+' ]'+'鎷滆鍖哄垎 [ ' + ged.visitDistinction + ' ]鏃犳晥锛屾鏉℃暟鎹烦杩囦笉鎵ц \n';
+ // 20230109 ljh end
return;
}
+ //鏃ユ姤瀹℃壒閫氳繃涔嬪悗锛屼笉鑳藉湪鍒涘缓鎶ュ憡涓�瑙�
+ if(null!=drc){
+ // 20230109 ljh start
+ // if(drc.Status__c=='鎵胯獚'){
+ if(drc.Status__c=='鎵胯獚' || drc.Status__c=='鐢宠珛涓�'){
+ // logstr += '鏃ユ姤鐘舵�� [' + drc.Status__c +' ],姝ゆ潯鏁版嵁璺宠繃涓嶆墽琛� \n';
+ logstr += '[ '+ged.replyID+' ]'+'鏃ユ姤鐘舵�� [' + drc.Status__c +' ],姝ゆ潯鏁版嵁璺宠繃涓嶆墽琛� \n';
+ // 20230109 ljh end
+ return;
+ }
+ }
+ Datetime startdate1 = NFMUtil.parseStr2DateTime(ged.visitStartDate);
+ Datetime enddate1 = NFMUtil.parseStr2DateTime(ged.visitEndDate);
+ Long timeDif = enddate1.getTime() - startdate1.getTime();
+ Integer ts = Integer.valueOf((enddate1.getTime() - startdate1.getTime()) / 1000 / 3600 /24);
+ system.debug( startdate1.getTime()+'==='+enddate1.getTime()+'==='+startdate1+'==='+enddate1+'==='+ts);
+ if(ts > 14){
+ // 20230109 ljh start
+ // logstr += '浜嬩欢鐨勬寔缁椂闂翠笉鑳借秴杩� 14 澶�,姝ゆ潯鏁版嵁璺宠繃涓嶆墽琛� \n';
+ logstr += '[ '+ged.replyID+' ]'+'浜嬩欢鐨勬寔缁椂闂翠笉鑳借秴杩� 14 澶�,姝ゆ潯鏁版嵁璺宠繃涓嶆墽琛� \n';
+ // 20230109 ljh start
+ return;
+ }
+
// 鏌ユ壘璁块棶瀵硅薄
String contactId = null;
if (String.isNotBlank(ged.applicantId)) {
@@ -109,7 +153,7 @@
}
}
- Event__c report = new Event__c();
+ Event__c report = new Event__c();//鎶ュ憡涓�瑙�
report.ServicePlatformCode__c = ged.replyID;//AWS娲诲姩缂栫爜
report.Account_ID__c = departmentAccount.Id;//绉戝
report.whatid__c = departmentAccount.Id;
@@ -123,14 +167,18 @@
report.Location__c = departmentAccount.Name; //浣嶇疆
report.Activity_Type2__c = strType;//鎷滆鍖哄垎
- // report.Activity_PurposeEscFSE__c = ged.visitPurpose;//鎷滆鐩殑
- // report.Purpose_TypeFSE__c = ged.activityDifferentiation;//娲诲姩鍖哄垎
+ //report.Activity_PurposeEscFSE__c = ged.visitPurpose;//鎷滆鐩殑
+ //report.Activity_PurposeFSE__c = ged.visitPurpose;//鎷滆鐩殑
+ //report.Purpose_TypeFSE__c = ged.activityDifferentiation;//娲诲姩鍖哄垎
+ report.Activity_PurposeFSE__c = NFMUtil.getMapValue(transferMap, 'Activity_PurposeFSE__c', string.valueof(ged.visitPurpose), iflog);
+ report.Purpose_TypeFSE__c = NFMUtil.getMapValue(transferMap, 'Purpose_TypeFSE__c', string.valueof(ged.activityDifferentiation), iflog);
report.Daily_Report__c = drc.Id;//鏃ユ姤
+ report.IsFromApplet__c = true;//20221226 ljh DB202212307127 鏄惁灏忕▼搴忔潵婧�
insert report;
logstr += '鎶ュ憡涓�瑙� [ '+ged.replyID+' ] 淇濆瓨鎴愬姛锛乗n';
}
+ // rowData.retry_cnt__c = 0; //蹇呭姞
- rowData.retry_cnt__c = 0; //蹇呭姞
} catch (Exception ex) {
// 銈ㄣ儵銉笺亴鐧虹敓銇椼仧鍫村悎
Database.rollback(sp);
@@ -175,7 +223,7 @@
}
- List < Daily_Report__c > drcs = [select Id, Reporter__r.Employee_No__c from Daily_Report__c where Reported_Date__c =: visitStartDate and Reporter__r.Employee_No__c =: ged.mngCd];
+ List < Daily_Report__c > drcs = [select Id, Reporter__r.Employee_No__c,Status__c from Daily_Report__c where Reported_Date__c =: visitStartDate and Reporter__r.Employee_No__c =: ged.mngCd];
if (drcs.size() > 0) {
result = drcs[0];
} else {
--
Gitblit v1.9.1