From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/classes/lexBatchSelectRepairLWCController.cls | 39 ---------------------------------------
1 files changed, 0 insertions(+), 39 deletions(-)
diff --git a/force-app/main/default/classes/lexBatchSelectRepairLWCController.cls b/force-app/main/default/classes/lexBatchSelectRepairLWCController.cls
index 26d7565..d8e1f6e 100644
--- a/force-app/main/default/classes/lexBatchSelectRepairLWCController.cls
+++ b/force-app/main/default/classes/lexBatchSelectRepairLWCController.cls
@@ -7,7 +7,6 @@
public static List<Repair__c> RepairList;
public static List<RepairData> RAInfoList;
public static List<String> repairIdList;
- // public static String pdfURL;
//鏌ヨRepair鏁版嵁
@AuraEnabled
@@ -16,7 +15,6 @@
//2023/04/07 LWC
ReturnData returnData = new ReturnData();
RetrievalData RevalInfo = (RetrievalData)System.JSON.deserialize(json,RetrievalData.class);
- System.debug(LoggingLevel.INFO, '*** RevalInfo: ' + RevalInfo);
//pageController 閫昏緫
RepairList = new List<Repair__c>();
@@ -25,7 +23,6 @@
&& String.isBlank(RevalInfo.SerialNumber) && String.isBlank(RevalInfo.repair.Incharge_Staff__c) && String.isBlank(RevalInfo.onSiteRepair)
&& String.isBlank(String.valueOf(RevalInfo.repair.Aware_date__c)) && String.isBlank(String.valueOf(RevalInfo.repair.Aware_date2__c)) && String.isBlank(RevalInfo.workLocationSelect)
&& String.isBlank(RevalInfo.State_Hospital)){
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '璇疯嚦灏戞坊鍔犱竴涓绱㈡潯浠�!'));
return null;
}
// 2023/04/10 add 鍨嬪彿锛屼慨鐞嗗鎵樿�� 鍚嶇О
@@ -43,7 +40,6 @@
sql += ' and HP_Name__c like \'%' + RevalInfo.HospitalName.trim() + '%\'';
}
if(String.isNotBlank(RevalInfo.RepairName)){
- System.debug(LoggingLevel.INFO, '***RevalInfo.RepairName.contains(): ' + RevalInfo.RepairName.contains(' '));
String splitStr = null;
if(RevalInfo.RepairName.contains(' ')){
splitStr = ' ';
@@ -61,10 +57,8 @@
}else{
sql += ' and Name like \'%' + RevalInfo.RepairName.trim() + '%\'';
}
- System.debug(LoggingLevel.INFO, '*** sql: ' + sql);
}
if(String.isNotBlank(RevalInfo.SAPRepairNo)){
- System.debug(LoggingLevel.INFO, '***RevalInfo.SAPRepairNo.contains(): ' + RevalInfo.SAPRepairNo.contains(' '));
String splitStr = null;
if(RevalInfo.SAPRepairNo.contains(' ')){
splitStr = ' ';
@@ -83,14 +77,12 @@
}else{
sql += ' and SAP_Service_Repair_No__c like \'%' + RevalInfo.SAPRepairNo.trim() + '%\'';
}
- System.debug(LoggingLevel.INFO, '*** sql: ' + sql);
}
if(String.isNotBlank(RevalInfo.SerialNumber)){
List<String> SerialNumberList = new List<String>();
if(RevalInfo.SerialNumber.indexOf(',') != -1){
SerialNumberList = RevalInfo.SerialNumber.split(',');
}
- System.debug('SerialNumberList1:' + SerialNumberList);
// 鏀寔妯＄硦鏌ヨ澶氫釜锛屾枃鏈杈撳叆鐢ㄨ嫳鏂囧崐瑙掗�楀彿鍒嗛殧
if(SerialNumberList.size() > 0){
sql += ' and (SerialNumber__c like \'%';
@@ -126,7 +118,6 @@
if(RevalInfo.workLocationSelect.indexOf(',') != -1){
workLocationSelectList = RevalInfo.workLocationSelect.split(',');
}
- System.debug('workLocationSelectList1:' + workLocationSelectList);
if(workLocationSelectList.size() > 0){
sql += ' and (work_location_select__c like \'%';
Integer i = 0;
@@ -147,17 +138,14 @@
sql += ' and State_Hospital__c like \'%' + RevalInfo.State_Hospital.trim() + '%\'';
}
sql += 'and Status1__c not in(\'0.鍒犻櫎\',\'0.鍙栨秷\') limit 200';
- System.debug('sql1LWC:' + sql);
if(String.isNotBlank(sql)){
RepairList = Database.query(sql);
}
if(RepairList.size() == 200){
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '妫�绱㈡暟鎹お澶�,璇风缉灏忔绱㈣寖鍥达紒'));
//2023/04/07 returnData
returnData.status = '妫�绱㈡暟鎹お澶�,璇风缉灏忔绱㈣寖鍥达紒';
}
if(RepairList.size() <= 0){
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '娌℃绱㈠埌浠讳綍淇悊'));
//2023/04/07 returnData
returnData.status = '娌℃绱㈠埌浠讳綍淇悊';
return returnData;
@@ -166,17 +154,14 @@
RepairData raData = new RepairData(ra);
RAInfoList.add(raData);
}
- // return RAInfoList;
returnData.repairData = RAInfoList;
- System.debug(LoggingLevel.INFO, '*** returnData: ' + returnData);
return returnData;
}
//鎵撳嵃PDF
@AuraEnabled
public static String showPDF(String json) {
- System.debug(LoggingLevel.INFO, '*** joinshoPDF: ');
List<Repair__c> RepairList = (List<Repair__c>)System.JSON.deserialize(json,List<Repair__c>.class);
if(RepairList == null || RepairList.isEmpty()){
@@ -184,39 +169,18 @@
}
repairIdList = new List<String>();
for(Repair__c rd : RepairList) {
- System.debug(LoggingLevel.INFO, '*** rd: ' + rd);
repairIdList.add(rd.Id);
}
- // RepairList = new List<Repair__c>();
String url = '=';
- /*System.debug('RAInfoList:' + RAInfoList);
- if(RAInfoList == null || RAInfoList.isEmpty()){
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '璇峰厛妫�绱慨鐞�'));
- return '璇峰厛妫�绱慨鐞�';
- }*/
- /*for(RepairData rd : RAInfoList) {
- System.debug(LoggingLevel.INFO, '*** rd: ' + rd);
- //閫変腑鐨剅epair
- if(rd.IFCheck){
- repairIdList.add(rd.repair.Id);
- RepairList.add(rd.repair);
- }
- }*/
- System.debug(LoggingLevel.INFO, '***repairIdList : ' + repairIdList);
- System.debug(LoggingLevel.INFO, '***RepairList : ' + RepairList);
if(repairIdList.size() > 0){
if(repairIdList.size() <= 50){
if(RepairList.size() > 0){
- System.debug(LoggingLevel.INFO, '*** if size>0 generateAttachment: ');
generateAttachment(RepairList);
}
for(String Id : repairIdList){
url += Id + '=';
}
url = url.substring(0, url.lastIndexOf('='));
- // PageReference pageRef = new PageReference('/apex/MaintenanceCommissionPDF?id' + url);
- // pageRef.setRedirect(true);
- // return pageRef;
String pdfURL = '';
if(isSandbox()){
pdfURL = 'https://ocsm--stagefull--c.visualforce.com/apex/MaintenanceCommissionPDF?id' + url;
@@ -225,18 +189,15 @@
}
return pdfURL;
} else{
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '澶氬崟鎵撳嵃鏈�澶ф暟閲忎负50,璇烽�夋嫨灏戜簬50涓慨鐞嗭紒'));
return '澶氬崟鎵撳嵃鏈�澶ф暟閲忎负50,璇烽�夋嫨灏戜簬50涓慨鐞嗭紒';
}
} else{
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '璇疯嚦灏戦�夋嫨涓�涓慨鐞�'));
return '璇疯嚦灏戦�夋嫨涓�涓慨鐞�';
}
}
// 鐢熸垚pdf娣诲姞鍒板搴旂殑淇悊涓�
public static PageReference generateAttachment(List<Repair__c> repList){
- System.debug(LoggingLevel.INFO, '*** generateAttachment: ');
BatchSelectRepairPDFDelete pdf = new BatchSelectRepairPDFDelete();
pdf.deletePDF(repList);
pdf.createPDF(repList);
--
Gitblit v1.9.1