From ec47f5ab5923a315bf22e0df5af7371e9668589e Mon Sep 17 00:00:00 2001
From: 张宇恒 <bxyun0@163.com>
Date: 星期五, 23 十二月 2022 11:16:18 +0800
Subject: [PATCH] 修理接口推送触发条件新加故障描述修理内容等
---
force-app/main/default/classes/FixtureRentalPDFController.cls | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/classes/FixtureRentalPDFController.cls b/force-app/main/default/classes/FixtureRentalPDFController.cls
index da042cf..0c0d353 100644
--- a/force-app/main/default/classes/FixtureRentalPDFController.cls
+++ b/force-app/main/default/classes/FixtureRentalPDFController.cls
@@ -36,6 +36,12 @@
public Boolean addFlag { get; private set; }//鏁忔劅鍦板潃浣跨敤鏍囪
public String qrcode { get; private set; }
public String barcode { get; private set; }
+ // 20220413 ljh 鎶ご鏄剧ず add start
+ public String AgencyAddressName { get; private set; }
+ public Boolean isAgencyOrCenter { get; private set; }
+ public String AgencyOrCenterAddress { get; private set; }
+ // 20220413 ljh 鎶ご鏄剧ず add end
+
public FixtureRentalPDFController() {
pageNum = Integer.valueOf(ApexPages.currentPage().getParameters().get('page'));
rentalApplyIdIMG = ApexPages.currentPage().getParameters().get('raid');
@@ -483,23 +489,40 @@
//鏂板缓涓�椤�
PDFInfo info = new PDFInfo(new Rental_Apply__c(),New List<Rental_Apply_Equipment_Set_Detail__c>());
+ // 20220413 ljh 鎶ご鏄剧ず update start
//20201120 LJH OCSM_BP5-61 update start
+ // if(!IsShowLU){
+ // if(!IsMain){
+ // info.isAgencyOrCenter = true;//鍔炰簨澶�
+ // info.AgencyAddressName = '璇峰皢澶囧搧鍥炲瘎鑷�';
+ // info.AgencyAddressName += ApplyHeadShow.ToAgency__c == null ? '' : ApplyHeadShow.ToAgency__c;
+ // info.AgencyAddressName += '鍔炰簨澶�';
+ // info.AgencyOrCenterAddress = AgencyAddressIdMap.get(ApplyHeadShow.Id);
+ // }else{
+ // info.isAgencyOrCenter = false;//澶囧搧涓績
+ // info.AgencyOrCenterAddress = centerAddressInfo;
+ // }
+ // }else{
+ // info.isAgencyOrCenter = false;//澶囧搧涓績
+ // info.AgencyOrCenterAddress = centerAddressInfo;
+ // }
+ //20201120 LJH OCSM_BP5-61 update end
if(!IsShowLU){
if(!IsMain){
- info.isAgencyOrCenter = true;//鍔炰簨澶�
- info.AgencyAddressName = '璇峰皢澶囧搧鍥炲瘎鑷�';
- info.AgencyAddressName += ApplyHeadShow.ToAgency__c == null ? '' : ApplyHeadShow.ToAgency__c;
- info.AgencyAddressName += '鍔炰簨澶�';
- info.AgencyOrCenterAddress = AgencyAddressIdMap.get(ApplyHeadShow.Id);
+ isAgencyOrCenter = true;//鍔炰簨澶�
+ AgencyAddressName = '璇峰皢澶囧搧鍥炲瘎鑷�';
+ AgencyAddressName += ApplyHeadShow.ToAgency__c == null ? '' : ApplyHeadShow.ToAgency__c;
+ AgencyAddressName += '鍔炰簨澶�';
+ AgencyOrCenterAddress = AgencyAddressIdMap.get(ApplyHeadShow.Id);
}else{
- info.isAgencyOrCenter = false;//澶囧搧涓績
- info.AgencyOrCenterAddress = centerAddressInfo;
+ isAgencyOrCenter = false;//澶囧搧涓績
+ AgencyOrCenterAddress = centerAddressInfo;
}
}else{
- info.isAgencyOrCenter = false;//澶囧搧涓績
- info.AgencyOrCenterAddress = centerAddressInfo;
+ isAgencyOrCenter = false;//澶囧搧涓績
+ AgencyOrCenterAddress = centerAddressInfo;
}
- //20201120 LJH OCSM_BP5-61 update end
+ // 20220413 ljh 鎶ご鏄剧ず update end
integer PageCut = 0;
if (PageAllNum>=7) {
PageAllNum=7;
@@ -579,9 +602,11 @@
// Data Bean
class PDFInfo {
public String eSetName { get; private set; } //澶囧搧涓績绠＄悊鍗曞彿
- public String AgencyAddressName { get; private set; } //鍥炲瘎鍦板潃 20201123 LJH OCSM_BP5-61 add
- public Boolean isAgencyOrCenter { get; private set; } //澶囧搧涓績锛熷姙浜嬪 20201123 LJH OCSM_BP5-61 add
- public String AgencyOrCenterAddress { get; private set; }//20201124 LJH OCSM_BP5-61 add
+ // 20220413 ljh 鎶ご鏄剧ず update start
+ // public String AgencyAddressName { get; private set; } //鍥炲瘎鍦板潃 20201123 LJH OCSM_BP5-61 add
+ // public Boolean isAgencyOrCenter { get; private set; } //澶囧搧涓績锛熷姙浜嬪 20201123 LJH OCSM_BP5-61 add
+ // public String AgencyOrCenterAddress { get; private set; }//20201124 LJH OCSM_BP5-61 add
+ // 20220413 ljh 鎶ご鏄剧ず update end
public String requestOwner { get; private set; } //鐢宠浜�
public String salesDept { get; private set; } //鎵�灞炴湰閮�
public String workPlace { get; private set; } //鎵�灞炲姙浜嬪
--
Gitblit v1.9.1