From 1db55201c3b08ecec076b53884e0a84b174e7057 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期二, 04 四月 2023 15:24:08 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/lwc/lexOSHSubmit/lexOSHSubmit.js | 12 +++-
force-app/main/default/lwc/lexRCSubmit/lexRCSubmit.js | 9 +--
force-app/main/default/classes/QISReportController.cls | 143 +++++++++++++++++++++++++++--------------------
3 files changed, 93 insertions(+), 71 deletions(-)
diff --git a/force-app/main/default/classes/QISReportController.cls b/force-app/main/default/classes/QISReportController.cls
index e2eb1d3..884872e 100644
--- a/force-app/main/default/classes/QISReportController.cls
+++ b/force-app/main/default/classes/QISReportController.cls
@@ -1,4 +1,5 @@
public with sharing class QISReportController {
+ // Final universal code缂栬緫
@AuraEnabled
public static InitData initForQisUniversalFailureCodeButton (String recordId){
InitData res = new initData();
@@ -15,7 +16,8 @@
@AuraEnabled
public static InitData sqlForPAE (String qisReportId){
InitData res = new initData();
- String RecordTypeId = 'ASACDecision';
+ ConstClass Constc = new ConstClass();
+ String RecordTypeId = Constc.REC_DEVELOPERNAME_ASA;
try{
PAE_DecisionRecord__c RCPAED_IdList = [SELECT LastModifiedDate, Id, Name, LastModifiedById,RecordType.DeveloperName FROM PAE_DecisionRecord__c where PAE_QIS__c = :qisReportId And RecordType.DeveloperName = :RecordTypeId limit 1];
res.PAEid = RCPAED_IdList.id;
@@ -26,6 +28,35 @@
return res;
}
+ //Intake universal code缂栬緫
+ @AuraEnabled
+ public static InitData initForlexQISIntakeuniversalcodeButton (String recordId){
+ InitData res = new initData();
+ try{
+ QIS_Report__c report = [SELECT id FROM QIS_Report__c WHERE Id = :recordId LIMIT 1];
+ res.Id = report.Id;
+ System.debug(LoggingLevel.INFO, '*** res: ' + res);
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO, '*** e: ' + e);
+ }
+ return res;
+ }
+
+ @AuraEnabled
+ public static InitData sqlForPAE1 (String qisReportId){
+ InitData res = new initData();
+ ConstClass Constc = new ConstClass();
+ String RecordTypeId = Constc.REC_DEVELOPERNAME_ASR;
+ try{
+ PAE_DecisionRecord__c ASRCD_IdList = [SELECT LastModifiedDate, Id, Name, LastModifiedById,RecordType.DeveloperName FROM PAE_DecisionRecord__c where PAE_QIS__c = :qisReportId And RecordType.DeveloperName = :RecordTypeId Limit 1];
+ res.PAEid = ASRCD_IdList.id;
+ System.debug(LoggingLevel.INFO, '*** res: ' + res);
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO, '*** e: ' + e);
+ }
+ return res;
+ }
+ //OSH鐜板搧鏀跺埌
@AuraEnabled
public static InitData initForOSHRecievedButton (String recordId){
InitData res = new initData();
@@ -45,13 +76,12 @@
String re = '鎴愬姛';
try{
ID myUserID = UserInfo.getUserId();
+ ConstClass Constc = new ConstClass();
User tempUser = [select id,Alias,Email from user where id = : myUserID ];
QIS_Report__c rac = new QIS_Report__c();
rac.id = recordId;
- rac.QIS_Status__c = 'OSH妫�娴嬩腑';
- // 寰呰ˉ鍏�
+ rac.QIS_Status__c = Constc.QIS_STATUS1;
rac.OSHRecievedDate__c = Date.today();
- System.debug( 'OSHRecievedDate__c=' + rac.OSHRecievedDate__c);
rac.OSH_Receive_staff__c = tempUser.Alias;
rac.OSH_staff__c = tempUser.Alias;
rac.OSH_staff_email__c = tempUser.email;
@@ -75,7 +105,7 @@
return re;
}
-
+ //鎻愪氦寰呭鎵�1
@AuraEnabled
public static InitData initForOSHSubmitButton (String recordId){
InitData res = new initData();
@@ -95,9 +125,10 @@
public static String updateQis1 (String recordId){
String re = '鎴愬姛';
try{
+ ConstClass Constc = new ConstClass();
QIS_Report__c rac = new QIS_Report__c();
rac.id = recordId;
- rac.QIS_Status__c = 'OSH濉啓瀹屾瘯';
+ rac.QIS_Status__c = Constc.QIS_STATUS2;
update rac;
}catch(Exception e){
System.debug(LoggingLevel.INFO, '*** e: ' + e);
@@ -105,7 +136,7 @@
}
return re;
}
-
+ //鎻愪氦寰呭鎵�
@AuraEnabled
public static InitData initForRCSubmitButton (String recordId){
InitData res = new initData();
@@ -130,13 +161,14 @@
@AuraEnabled
public static String updateQisWithRC (String recordId,String type,String oldQIStatus){
String re = '鎴愬姛';
+ ConstClass Constc = new ConstClass();
ID myUserID = UserInfo.getUserId();
User userinfo = [SELECT Id, JingliApprovalManager__c, BuchangApprovalManager__c, ZongjianApprovalManager__c, BuchangApprovalManagerSales__c, SalesManager__c FROM User WHERE Id = :myUserID LIMIT 1];
QIS_Report__c rac = new QIS_Report__c();
rac.id = recordId;
if (type == '1') {
QIS_Report__c report1 = [SELECT id,RC_problem_not_found__c,RC_FixedJudgement__c FROM QIS_Report__c WHERE Id = :recordId LIMIT 1];
- rac.QIS_Status__c = 'RC濉啓瀹屾瘯';
+ rac.QIS_Status__c = Constc.QIS_STATUS3;
if (report1.RC_problem_not_found__c == true && report1.RC_FixedJudgement__c == false) {
QIS_Report__c qisreport = [SELECT Id, Reason_bloken__c, Special_follow__c, next_action__c, QIS_Reply_Comment__c, OCM_judgement__c FROM QIS_Report__c WHERE Id = :recordId LIMIT 1];
if (qisreport != null) {
@@ -149,7 +181,7 @@
}
}
if (type == '2') {
- rac.QIS_Status__c = '鍙栨秷鐢宠';
+ rac.QIS_Status__c = Constc.QIS_STATUS4;
rac.QIS_Cancel_Submit_day__c = Date.today();
}
try{
@@ -159,7 +191,7 @@
rac.RC_Manager__c = myUserID;
}
if (userinfo!=null) {
- if (oldQIStatus == 'RC妫�娴嬩腑') {
+ if (oldQIStatus == Constc.QIS_STATUS5) {
rac.RC__c = myUserID;
}
if (userinfo.SalesManager__c != null ) {
@@ -185,64 +217,25 @@
}
return re;
}
+
- @AuraEnabled
- public static InitData initForOCMSubmitButton (String recordId){
- InitData res = new initData();
- try{
- QIS_Report__c report = [SELECT id,is_aohui_product__c,QIS_Status__c,OCM_Manager_Mail_F__c,QISInstallDate__c,contract_number__c FROM QIS_Report__c WHERE Id = :recordId LIMIT 1];
- res.Id = report.Id;
- res.QIStatus = report.QIS_Status__c;
- res.QISInstallDate = report.QISInstallDate__c;
- res.contractnumber = report.contract_number__c;
- res.isaohuiproduct = report.is_aohui_product__c;
- System.debug(LoggingLevel.INFO, '*** res: ' + res);
- }catch(Exception e){
- System.debug(LoggingLevel.INFO, '*** e: ' + e);
- }
- return res;
- }
-
- @AuraEnabled
- public static String updateQisWithOCM (String recordId){
- String re = '鎴愬姛';
- QIS_Report__c report = [SELECT id,QIS_Status__c,QISInstallDate__c,contract_number__c,OCM_Manager_Mail_F__c
- ,OCM_Member_Mail_F__c,OCM_Repair_Mail_F__c,OCM_Repair_Mail1_F__c,FSE_Special_Mail_F__c,FSE_Special_Manager_Mail_F__c
- ,WorkLocation_CC_Mail_F__c,is_aohui_product__c,QuolityApproveResult__c
- FROM QIS_Report__c WHERE Id = :recordId LIMIT 1];
- try{
- QIS_Report__c rac = new QIS_Report__c();
- rac.id = recordId;
- rac.QIS_Status__c = 'FSE濉啓瀹屾瘯';
- rac.OCM_Manager_Mail__c = report.OCM_Manager_Mail_F__c;
- rac.OCM_Member_Mail__c = report.OCM_Member_Mail_F__c;
- rac.OCM_Repair_Mail__c = report.OCM_Repair_Mail_F__c;
- rac.OCM_Repair_Mail1__c = report.OCM_Repair_Mail1_F__c;
- rac.FSE_Special_Mail__c = report.FSE_Special_Mail_F__c;
- rac.FSE_Special_Manager_Mail__c = report.FSE_Special_Manager_Mail_F__c;
- rac.WorkLocation_CC_Mail__c = report.WorkLocation_CC_Mail_F__c;
- rac.Cancel_QIS_Reason__c = null;
- if (report.is_aohui_product__c == true) {
- rac.OCM_judgement__c = '璐ㄩ噺闂';
- rac.next_action__c = '鏃犲伩缁翠慨';
- rac.RecordTypeId = '01210000000RLWm';
- rac.QIS_Status__c = 'OSH妫�娴嬬敵璇�';
- }
- if (report.QuolityApproveResult__c == null || report.QuolityApproveResult__c == '') {
- rac.QuolityApproveResult__c = '3.宸插鏍革紝涓�鑸川閲忛棶棰�';
- }
- update rac;
- }catch(Exception e){
- System.debug(LoggingLevel.INFO, '*** e: ' + e);
- re = e.getMessage();
- }
- return re;
- }
public class InitData{
@AuraEnabled
public String Id;
@AuraEnabled
+ public String OwnerId;
+ @AuraEnabled
+ public String qisRecordTypeId;
+ @AuraEnabled
+ public String qisRecordName;
+ @AuraEnabled
+ public String ProfileName;
+ @AuraEnabled
public String PAEid;
+ @AuraEnabled
+ public String OCSMAdministrativeReportNumber;
+ @AuraEnabled
+ public String OCSMAdministrativeReportStatus;
@AuraEnabled
public String QIStatus;
@AuraEnabled
@@ -262,8 +255,34 @@
@AuraEnabled
public Date QISInstallDate;
@AuraEnabled
+ public Date CDS_date;
+ @AuraEnabled
+ public Date Aware_date;
+ @AuraEnabled
+ public Date OCSMAdministrativeReportDate;
+ @AuraEnabled
public Boolean RCproblemnotfound;
@AuraEnabled
public Boolean isaohuiproduct;
+ @AuraEnabled
+ public Boolean IsSendQIS;
}
+
+ public class ConstClass{
+ final String REC_DEVELOPERNAME_ASA = 'ASACDecision';
+ final String REC_DEVELOPERNAME_ASR = 'ASRCDecision';
+ final String REC_OSH_ID = '01210000000RLWm';
+ final String REC_ANSWERCOMP_ID = '01210000000RLgY';
+ final String REC_FINAL_ID = '01210000000gFTH';
+ final String REC_COMP_ID = '01210000000RLcW';
+ final String QIS_STATUS1 = 'OSH妫�娴嬩腑';
+ final String QIS_STATUS2 = 'OSH濉啓瀹屾瘯';
+ final String QIS_STATUS3 = 'RC濉啓瀹屾瘯';
+ final String QIS_STATUS4 = '鍙栨秷鐢宠';
+ final String QIS_STATUS5 = 'RC妫�娴嬩腑';
+ final String QIS_STATUS6 = 'FSE濉啓瀹屾瘯';
+ final String QIS_STATUS7 = 'OSH妫�娴嬬敵璇�';
+ final String QIS_STATUS8 = '瀹屾瘯';
+ }
+
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexOSHSubmit/lexOSHSubmit.js b/force-app/main/default/lwc/lexOSHSubmit/lexOSHSubmit.js
index e4901c7..65d0f97 100644
--- a/force-app/main/default/lwc/lexOSHSubmit/lexOSHSubmit.js
+++ b/force-app/main/default/lwc/lexOSHSubmit/lexOSHSubmit.js
@@ -13,7 +13,7 @@
qisStatus;
OSHstaff;
OSHstaffEmail;
-
+ err;
@wire(CurrentPageReference)
getStateParameters(currentPageReference) {
console.log(111);
@@ -86,8 +86,14 @@
}).then(result =>{
console.log('result'+result);
if (result!='鎴愬姛') {
- alert(result);
- }
+ this.err = result;
+ const evt = new ShowToastEvent({
+ title : '鏇存柊澶辫触',
+ message: this.err,
+ variant: 'error'
+ });
+ this.dispatchEvent(evt);
+ }
this.dispatchEvent(new CloseActionScreenEvent());
this.updateRecordView(this.recordId);
}).catch(error => {
diff --git a/force-app/main/default/lwc/lexRCSubmit/lexRCSubmit.js b/force-app/main/default/lwc/lexRCSubmit/lexRCSubmit.js
index 002e02a..d548720 100644
--- a/force-app/main/default/lwc/lexRCSubmit/lexRCSubmit.js
+++ b/force-app/main/default/lwc/lexRCSubmit/lexRCSubmit.js
@@ -21,6 +21,7 @@
QISReplyDay;
RCproblemnotfound;
type;
+ err;
@wire(CurrentPageReference)
getStateParameters(currentPageReference) {
console.log(111);
@@ -51,11 +52,6 @@
this.RCinspectionDate = result.RCinspectionDate;
this.QISReplyDay = result.QISReplyDay;
this.RCproblemnotfound = result.RCproblemnotfound;
- console.log('this.qisStatus='+this.qisStatus);
- console.log('this.CancelQISReason='+this.CancelQISReason);
- console.log('this.Rcid='+this.Rcid);
- console.log('this.RCproblemnotfound='+this.RCproblemnotfound);
- console.log('this.RCinspectionDate='+this.RCinspectionDate);
if (this.qisStatus!='RC妫�娴嬩腑') {
const evt = new ShowToastEvent({
title : '宸茬粡鎻愪氦瀹℃壒',
@@ -142,10 +138,11 @@
oldQIStatus: this.qisStatus
}).then(result =>{
console.log('result'+result);
+ this.err = result;
if (result!='鎴愬姛') {
const evt = new ShowToastEvent({
title : '鏇存柊澶辫触',
- message: result,
+ message: this.err,
variant: 'error'
});
this.dispatchEvent(evt);
--
Gitblit v1.9.1