From 74e6a383570060d05c58f731fa7cd9f241db50bd Mon Sep 17 00:00:00 2001
From: twysparks <twysparks@163.com>
Date: 星期四, 20 四月 2023 14:07:42 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/classes/ReportController.cls | 104 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 77 insertions(+), 27 deletions(-)
diff --git a/force-app/main/default/classes/ReportController.cls b/force-app/main/default/classes/ReportController.cls
index aea48b6..790ccbc 100644
--- a/force-app/main/default/classes/ReportController.cls
+++ b/force-app/main/default/classes/ReportController.cls
@@ -218,7 +218,7 @@
//缁欐彁浜ょ浉搴旂殑js鎻愪緵鍒濆鍖栨暟鎹�
@AuraEnabled
- public static void updateForSubmitButton(String reocrdId){
+ public static String updateForSubmitButton(String reocrdId){
try {
Report__c rac = new Report__c();
rac.Id = reocrdId;
@@ -226,26 +226,34 @@
rac.Submit_time__c = Datetime.now();
rac.Submit_report_day__c = Date.today();
update rac;
+ return null;
} catch (Exception e) {
- throw new AuraHandledException(e.getMessage());
+ String eMessage = e.getMessage();
+ Integer left = eMessage.indexOf(',') + 1;
+ Integer right = eMessage.length();
+ return eMessage.substring(left,right);
}
}
//OPDtoSIS鎿嶄綔鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
- public static void updateForOPDtoSISButton(String recordId){
+ public static String updateForOPDtoSISButton(String recordId){
try {
Report__c rac = new Report__c();
rac.Id = recordId;
rac.RecordTypeId = Schema.SObjectType.Report__c.getRecordTypeInfosByName().get(LightingButtonConstant.RECORD_TYPE_NAME_BY_OPD).getRecordTypeId();
update rac;
+ return null;
} catch (Exception e) {
- System.debug(LoggingLevel.INFO, '*** e: ' + e);
+ String eMessage = e.getMessage();
+ Integer left = eMessage.indexOf(',') + 1;
+ Integer right = eMessage.length();
+ return eMessage.substring(left,right);
}
}
//鍙栨秷鎻愪氦鎿嶄綔鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
- public static void updateForCancelSubmitReportButton(String recordId){
+ public static String updateForCancelSubmitReportButton(String recordId){
try {
Report__c rac = new Report__c();
rac.Id = recordId;
@@ -253,33 +261,45 @@
rac.Submit_report_day__c = null;
rac.Submit_time__c = null;
update rac;
+ return null;
} catch (Exception e) {
- throw new AuraHandledException(e.getMessage());
+ String eMessage = e.getMessage();
+ Integer left = eMessage.indexOf(',') + 1;
+ Integer right = eMessage.length();
+ return eMessage.substring(left,right);
}
}
//瀹屾瘯鎿嶄綔鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
- public static void updateForCompleteButton(String recordId){
+ public static String updateForCompleteButton(String recordId){
Report__c rac = new Report__c();
try {
rac.Id = recordId;
rac.Status__c = LightingButtonConstant.STATUS_COMPLETE;
rac.RecordTypeId = Schema.SObjectType.Report__c.getRecordTypeInfosByName().get(LightingButtonConstant.VOC_NAME).getRecordTypeId();
update rac;
+ return null;
} catch (Exception e) {
- throw new AuraHandledException(e.getMessage());
+ String eMessage = e.getMessage();
+ Integer left = eMessage.indexOf(',') + 1;
+ Integer right = eMessage.length();
+ return eMessage.substring(left,right);
}
}
//OCSM瑕佹姤鍛婃搷浣滄洿鏂扮浉搴旀暟鎹�
@AuraEnabled
- public static void updateForOCSMToReportButton(String recordId){
+ public static String updateForOCSMToReportButton(String recordId){
try {
Report__c rac = new Report__c();
rac.Id = recordId;
rac.OCSMAdministrativeReportStatus__c = LightingButtonConstant.STATUS_TO_BE_REPORTED;
update rac;
+ return null;
} catch (Exception e) {
- System.debug(LoggingLevel.INFO, '*** e: ' + e);
+ String eMessage = e.getMessage();
+ Integer left = eMessage.indexOf(',') + 1;
+ Integer right = eMessage.length();
+ return eMessage.substring(left,right);
}
}
@@ -293,50 +313,65 @@
update rac;
return null;
} catch (Exception e) {
- return e.getMessage();
+ String eMessage = e.getMessage();
+ Integer left = eMessage.indexOf(',') + 1;
+ Integer right = eMessage.length();
+ return eMessage.substring(left,right);
}
}
//DispatchOCSMQARA鎿嶄綔鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
- public static void updateForDispatchOCSMQARAButton(String recordId){
+ public static String updateForDispatchOCSMQARAButton(String recordId){
try {
Report__c rac = new Report__c();
rac.Id = recordId;
rac.Dispatch_OCSM_QARA__c = true;
update rac;
+ return null;
} catch (Exception e) {
- System.debug(LoggingLevel.INFO, '*** e: ' + e);
+ String eMessage = e.getMessage();
+ Integer left = eMessage.indexOf(',');
+ Integer right = eMessage.length();
+ return eMessage.substring(left,right);
}
}
//OCSM涓嶈鎶ュ憡鎿嶄綔鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
- public static void updateForOCSMNoToReportButton(String recordId){
+ public static String updateForOCSMNoToReportButton(String recordId){
try {
Report__c rac = new Report__c();
rac.Id = recordId;
rac.OCSMAdministrativeReportStatus__c = LightingButtonConstant.STATUS_TO_NOT_REPORT;
update rac;
+ return null;
} catch (Exception e) {
- System.debug(LoggingLevel.INFO, '*** e: ' + e);
+ String eMessage = e.getMessage();
+ Integer left = eMessage.indexOf(',');
+ Integer right = eMessage.length();
+ return eMessage.substring(left,right);
}
}
//鍙栨秷鎿嶄綔鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
- public static void updateForCancelButton(String recordId){
+ public static String updateForCancelButton(String recordId){
try {
Report__c rac = new Report__c();
rac.Id = recordId;
rac.Status__c = LightingButtonConstant.STATUS_CANCEL;
update rac;
+ return null;
} catch (Exception e) {
- System.debug(LoggingLevel.INFO, '*** e: ' + e);
+ String eMessage = e.getMessage();
+ Integer left = eMessage.indexOf(',');
+ Integer right = eMessage.length();
+ return eMessage.substring(left,right);
}
}
//VOC缁撴灉纭鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
- public static void updateForVOCConfirmButton(String recordId,String Satisfy,String Satisfy1){
+ public static String updateForVOCConfirmButton(String recordId,String Satisfy,String Satisfy1){
try {
Report__c rac = new Report__c();
rac.Id = recordId;
@@ -362,8 +397,12 @@
}
}
update rac;
+ return null;
} catch (Exception e) {
- System.debug(LoggingLevel.INFO, '*** e: ' + e);
+ String eMessage = e.getMessage();
+ Integer left = eMessage.indexOf(',');
+ Integer right = eMessage.length();
+ return eMessage.substring(left,right);
}
}
//VOC鍥炵瓟鏇存柊鐩稿簲鏁版嵁
@@ -388,7 +427,7 @@
//鎻愪氦绔炰簤瀵规墜鎶ュ憡鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
- public static void updateForSubmitCompetitorReportButton(String recordId){
+ public static String updateForSubmitCompetitorReportButton(String recordId){
try {
Report__c rac = new Report__c();
rac.Id = recordId;
@@ -397,13 +436,17 @@
rac.Submit_report_day__c = Date.today();
rac.Date__c = Date.today();
update rac;
+ return null;
} catch (Exception e) {
- System.debug(LoggingLevel.INFO, '*** e: ' + e);
+ String eMessage = e.getMessage();
+ Integer left = eMessage.indexOf(',');
+ Integer right = eMessage.length();
+ return eMessage.substring(left,right);
}
}
//VOC鍥炵瓟鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
- public static void updateForVOCSubmitButton(String recordId ,String createdById){
+ public static String updateForVOCSubmitButton(String recordId ,String createdById){
try {
Report__c rac = [select Status__c,JingliApprovalManager__r.Id,BuchangApprovalManager__r.Id,SalesManager__r.Id,BuchangApprovalManagerSales__r.Id,ZongjianApprovalManager__c,Submit_time__c,Submit_report_day__c,Owner.Id from Report__c where Id = :recordId];
// share
@@ -424,15 +467,18 @@
userAccess.add(rac.ZongjianApprovalManager__c + LightingButtonConstant.USER_ACCESS_READ);
String rtn = ControllerUtil.setSObjectShare(LightingButtonConstant.SOBJECT_NAME_OF_REPORT_SHARE,LightingButtonConstant.SOBJECT_NAME_OF_VOC_SHARE,recordId,userAccess,rac.Owner.Id);
if (rtn != LightingButtonConstant.OK) {
- return;
+ return null;
}
rac.Status__c = LightingButtonConstant.STATUS_VOC_WRITE_OVER;
rac.Submit_time__c = Date.today();
rac.Submit_report_day__c = Date.today();
update rac;
+ return null;
} catch (Exception e) {
- System.debug(LoggingLevel.INFO, '*** e: ' + e);
-
+ String eMessage = e.getMessage();
+ Integer left = eMessage.indexOf(',');
+ Integer right = eMessage.length();
+ return eMessage.substring(left, right);
}
}
//VOC鍒ゅ畾鏇存柊鐩稿簲鏁版嵁
@@ -480,13 +526,17 @@
}
//VOC瀹屾瘯鎿嶄綔鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
- public static void updateForVOCFinishButton (String recordId) {
+ public static String updateForVOCFinishButton (String recordId) {
try {
Report__c report = [select Id,Status__C from Report__c where Id = :recordId];
report.Status__c = LightingButtonConstant.STATUS_VOC_FINISH;
update report;
+ return null;
} catch (Exception e) {
- System.debug(LoggingLevel.INFO, '*** e: ' + e);
+ String eMessage = e.getMessage();
+ Integer left = eMessage.indexOf(',');
+ Integer right = eMessage.length();
+ return eMessage.substring(left,right);
}
}
public class InitData{
--
Gitblit v1.9.1