From e3c02c03dd2de442bbced87236f60a13a1cd154e Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 02 三月 2023 17:51:57 +0800
Subject: [PATCH] gzw 正式环境最新代码更新
---
force-app/main/default/classes/ChoiceAssetController.cls | 106 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 79 insertions(+), 27 deletions(-)
diff --git a/force-app/main/default/classes/ChoiceAssetController.cls b/force-app/main/default/classes/ChoiceAssetController.cls
index 14da60f..7e2b630 100644
--- a/force-app/main/default/classes/ChoiceAssetController.cls
+++ b/force-app/main/default/classes/ChoiceAssetController.cls
@@ -72,13 +72,21 @@
//1.鍙煡鎵�100鏉′繚鏈夎澶囨暟鎹�
String fuselageNumberTrim = String.isNotBlank(FuselageNumber)?FuselageNumber.trim():'';
String serialNumber = '%' + String.escapeSingleQuotes(fuselageNumberTrim.replaceAll('%', '\\%')) + '%';
- List < Asset > assetListed = [SELECT Id,name,SerialNumber,InstallDate,Information_From__c,Asset_situation__c,
+ List < Asset > assetListed = [SELECT Id,name,SerialNumber,InstallDate,
+ // Information_From__c,// 20220927 ljh XLIU-CJN62G
+ Asset_situation__c,
Order_No__c,Account.Name,Status,Department_Class__c,Hospital__r.Owner.Name,
Hospital__r.Owner.Phone,Installation_Site__c,CurrentContract__c,
Product2.Asset_Model_No__c,Hospital__r.Name,Department_Class__r.Name ,
- Department_Class__r.Id,Ji_Zhong_Guan_Li_Ku_Cun__c,Account.RecordTypeId
+ Department_Class__r.Id,
+ // Ji_Zhong_Guan_Li_Ku_Cun__c,// 20220927 ljh XLIU-CJN62G
+ Posting_Date__c,Extend_Gurantee_DateTo__c,CurrentContract_End_Date__c,// 20220927 ljh XLIU-CJN62G
+ Account.RecordTypeId
,Account.Parent.Parent.FSE_SP_Main_Leader__r.Work_Location__c
,Account.Parent.FSE_SP_Main_Leader__r.Work_Location__c
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 start
+ ,NoPartRiskDate_F__c
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 end
FROM Asset where Id != null AND Repairing_Count__c >= 0 AND SerialNumber like :serialNumber LIMIT 100
];
@@ -86,7 +94,6 @@
for (Asset ast: assetListed) {
choiceAssetInfoRecordsview.add(new ChoiceAssetInfo(ast));
}
-
}
// 妫�绱�
@@ -140,17 +147,39 @@
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鍙兘閫夋嫨涓�涓繚鏈夎澶�'));
return null;
}
-
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 start
+ List<Asset> ass = [select id,Product_ID__c from Asset where ID = :ast.Id];
+ List<Product2> p2 = [select id,Name,Can_Repair__c
+ from Product2 where
+ ID = :ass[0].Product_ID__c];
+ String canRepair = p2[0].Can_Repair__c;
+ if (canRepair=='绗笁鏂�'){
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '闈炴垜鍙镐慨鐞嗗璞★紝鏃犳硶鏂板缓淇悊锛屽鏈変笉鏄庤鍜ㄨCIC'));
+ return null;
+ }
+ if (canRepair=='涓�' || String.isBlank(canRepair)){
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鏈澶囨棤娉曟柊寤轰慨鐞�'));
+ return null;
+ }
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 end
return createData(ast);
}
+
public PageReference createData(Asset ast) {
String url = '/';
String joint_1 = '=';
String joint_2 = '_lkid=';
String joint_3 = '&CF';
String joint_4 = '&';
-
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 start
+ List<Asset> ass = [select id,Product_ID__c from Asset where ID = :ast.Id];
+ List<Product2> p2 = [select id,Name,Can_Repair__c
+ from Product2 where
+ ID = :ass[0].Product_ID__c];
+ String canRepair = p2[0].Can_Repair__c;
+ system.debug('1111111111111111111'+canRepair);
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 end
if ('Repair'.equals(dataType)) {
String Delivered_Product_Id = '00N10000002Dx1X'; //璁惧鍨嬪彿
String Account_Id = '00N10000002Dx5n'; //绉戝
@@ -182,23 +211,30 @@
String ActualVisitDateThird_Id= '';//涓夋涓婇棬鏃�
String SubOrderCompleteDate_Id= '';//鎶ヤ慨鍗曞鐞嗗畬鎴愭棩
String SubOrderCreatedDate_Id= '';//鎶ヤ慨鍗曠敵璇蜂慨鐞嗘棩
+ //LLIU-CGX5E9 LY 20220812 start
+ String DateReceiptQuestions_Id = '';//闂鑱旂粶鏀跺埌鏃�
+ //LLIU-CGX5E9 LY 20220812 end
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 start
+ String Excwork_location_Id = '';//璺宠繃缁翠慨涓績
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 end
String engineerSendDate_Id= '';//宸ョ▼甯堜慨鐞嗗搧瀵勯�佹棩
- if (NFMUtil.isSandbox()) { //娴嬭瘯鐜
- RepairApplicant_Id = '00N1m0000054ufW'; //鎶ヤ慨浜�
- // RepairApplicantPosition_Id = '00N1m0000054ufV'; //鎶ヤ慨浜哄矖浣�
- RepairApplicantHospital_Id = '00N1m0000054ufU'; //鎶ヤ慨浜哄尰闄�
- RepairApplicantDepartment_Id = '00N1m0000054ufT'; //鎶ヤ慨浜虹瀹�
- baoxiuzidan = '00N1m0000054ufZ'; //鎶ヤ慨瀛愬崟
- faqiri = '00N1m0000054ufa'; //鎶ヤ慨鍙戣捣鏃�
- shouliri = '00N1m0000054ufS'; //宸ョ▼甯堝彈鐞嗘棩
+ // if (NFMUtil.isSandbox()) { //娴嬭瘯鐜
+ // RepairApplicant_Id = '00N1m0000054ufW'; //鎶ヤ慨浜�
+ // // RepairApplicantPosition_Id = '00N1m0000054ufV'; //鎶ヤ慨浜哄矖浣�
+ // RepairApplicantHospital_Id = '00N1m0000054ufU'; //鎶ヤ慨浜哄尰闄�
+ // RepairApplicantDepartment_Id = '00N1m0000054ufT'; //鎶ヤ慨浜虹瀹�
+ // //baoxiuzidan = '00N1m0000054ufZ'; //鎶ヤ慨瀛愬崟
+ // baoxiuzidan = '00N10000009H1rR'; //鎶ヤ慨瀛愬崟
+ // faqiri = '00N1m0000054ufa'; //鎶ヤ慨鍙戣捣鏃�
+ // shouliri = '00N1m0000054ufS'; //宸ョ▼甯堝彈鐞嗘棩
- PlannedVisitDay_Id= '00N1m000005SRiF';//璁″垝涓婇棬鏃�
- ActualVisitDateFirst_Id= '00N1m000005SRiK';//涓�娆′笂闂ㄦ棩
- ActualVisitDateSecond_Id= '00N1m000005SRiP';//浜屾涓婇棬鏃�
- ActualVisitDateThird_Id= '00N1m000005SRiU';//涓夋涓婇棬鏃�
- SubOrderCompleteDate_Id= '00N1m000005SRmg';//鎶ヤ慨鍗曞鐞嗗畬鎴愭棩
- SubOrderCreatedDate_Id= '00N1m000005SRmW';//鎶ヤ慨鍗曠敵璇蜂慨鐞嗘棩
- } else { //姝ｅ紡鐜
+ // PlannedVisitDay_Id= '00N1m000005SRiF';//璁″垝涓婇棬鏃�
+ // ActualVisitDateFirst_Id= '00N1m000005SRiK';//涓�娆′笂闂ㄦ棩
+ // ActualVisitDateSecond_Id= '00N1m000005SRiP';//浜屾涓婇棬鏃�
+ // ActualVisitDateThird_Id= '00N1m000005SRiU';//涓夋涓婇棬鏃�
+ // SubOrderCompleteDate_Id= '00N1m000005SRmg';//鎶ヤ慨鍗曞鐞嗗畬鎴愭棩
+ // SubOrderCreatedDate_Id= '00N1m000005SRmW';//鎶ヤ慨鍗曠敵璇蜂慨鐞嗘棩
+ // } else { //姝ｅ紡鐜
RepairApplicant_Id = '00N10000009H1rQ'; //鎶ヤ慨浜�
// RepairApplicantPosition_Id = ''; //鎶ヤ慨浜哄矖浣�
RepairApplicantHospital_Id = '00N10000009H1rP'; //鎶ヤ慨浜哄尰闄�
@@ -214,9 +250,20 @@
ActualVisitDateThird_Id= '00N10000009H1r8';//涓夋涓婇棬鏃�
SubOrderCompleteDate_Id= '00N10000009H1ri';//鎶ヤ慨鍗曞鐞嗗畬鎴愭棩
SubOrderCreatedDate_Id= '00N10000009H1rj';//鎶ヤ慨鍗曠敵璇蜂慨鐞嗘棩
- }
+ //LLIU-CGX5E9 LY 20220812 start
+ DateReceiptQuestions_Id= '00N10000008rsVQ';//闂鑱旂粶鏀跺埌鏃�
+ //LLIU-CGX5E9 LY 20220812 end
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 start
+ Excwork_location_Id = '00N10000009HAJl';//璺宠繃缁翠慨涓績
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 end
+ //}
url += 'a0J/e?retURL=%2F';
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 start
+ if (canRepair=='RC閫佷慨'){
+ url += joint_4 + Excwork_location_Id + joint_1 + true;
+ }
+ //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221110 end
url += joint_3 + Delivered_Product_Id + joint_1 + ast.Name;
url += joint_3 + Delivered_Product_Id + joint_2 + ast.Id;
@@ -253,6 +300,9 @@
url += joint_4 + ActualVisitDateSecond_Id+ joint_1 + NFMUtil.formatDateTime2StrSprit(repairSubOrder.ActualVisitDateSecon__c);//浜屾涓婇棬鏃�
url += joint_4 + ActualVisitDateThird_Id+ joint_1 + NFMUtil.formatDateTime2StrSprit(repairSubOrder.ActualVisitDateThird__c);//涓夋涓婇棬鏃�
url += joint_4 + SubOrderCompleteDate_Id+ joint_1 + NFMUtil.formatDateTime2StrSprit(repairSubOrder.ApplicationTime__c);//鎶ヤ慨鍗曞鐞嗗畬鎴愭棩
+ //LLIU-CGX5E9 LY 20220812 start
+ url += joint_4 + DateReceiptQuestions_Id+ joint_1 + NFMUtil.formatDateTime2StrSprit(repairSubOrder.ApplicationTime__c);//闂鑱旂粶鏀跺埌鏃�
+ //LLIU-CGX5E9 LY 20220812 end
url += joint_4 + SubOrderCreatedDate_Id+ joint_1 + NFMUtil.formatDateTime2StrSprit(Date.today());//鎶ヤ慨鍗曠敵璇蜂慨鐞嗘棩
url += joint_4 + shouliri + joint_1 + NFMUtil.formatDateTime2StrSprit(repairSubOrder.ReceiverTime__c);
@@ -311,11 +361,11 @@
String Generation_Source_Id = '00N10000002FHF6';//QIS鏉ユ簮
String Name_Id = 'Name';//QIS绠＄悊鍙风爜
- if (NFMUtil.isSandbox()) {
- baoxiuzidan = '00N1m000005STFv'; //鎶ヤ慨瀛愬崟
- } else {
+ // if (NFMUtil.isSandbox()) {
+ // baoxiuzidan = '00N1m000005STFv'; //鎶ヤ慨瀛愬崟
+ // } else {
baoxiuzidan = '00N10000009H22X'; //鎶ヤ慨瀛愬崟
- }
+ // }
url += 'a0f/e?retURL=%2Fa0f%2Fo&RecordType=01210000000RLWc&ent=01I10000000T5b1';
url += joint_3 + Delivered_Product_Id + joint_1 + ast.Name;
@@ -352,10 +402,12 @@
private String makeSoql() {
String start = '';
- String soql = 'select Id,name,SerialNumber,InstallDate,Information_From__c,Asset_situation__c,Order_No__c,Account.Name,Status,Department_Class__c, ';
+ String soql = 'select Id,name,SerialNumber,InstallDate,Asset_situation__c,Order_No__c,Account.Name,Status,Department_Class__c, ';
soql += 'Hospital__r.Owner.Name,Hospital__r.Owner.Phone,Installation_Site__c,CurrentContract__c,Product2.Asset_Model_No__c,Hospital__r.Name,Department_Class__r.Name ,Department_Class__r.Id,';
- soql += 'Ji_Zhong_Guan_Li_Ku_Cun__c,Account.Parent.Parent.FSE_SP_Main_Leader__r.Work_Location__c,Account.RecordTypeId';
+ soql += 'Account.Parent.Parent.FSE_SP_Main_Leader__r.Work_Location__c,Account.RecordTypeId';
+ soql += ',Posting_Date__c,Extend_Gurantee_DateTo__c,CurrentContract_End_Date__c ';// 20220927 ljh XLIU-CJN62G
+ soql += ',NoPartRiskDate_F__c ';//XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012
soql += ' from Asset where Id != null AND Repairing_Count__c = 0 ';
if (String.isNotBlank(FuselageNumber) || String.isNotBlank(AssetModel) || String.isNotBlank(HospitalName)) {
soql += ' AND (';
--
Gitblit v1.9.1