From c2c5fc25aa9e92a0ab8ebcea4e01a176359d2f78 Mon Sep 17 00:00:00 2001
From: fuyu <fuyu@prec-tech.com>
Date: 星期四, 05 一月 2023 10:12:41 +0800
Subject: [PATCH] 德勤修改后代码备份
---
force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.auradoc | 6
force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayHelper.js | 33 ++
force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.cmp-meta.xml | 5
force-app/main/default/classes/AttachmentDisplayController.cls | 452 ++++++++++++++++++++++++++++++++
force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.css | 2
force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.design | 3
force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.svg | 7
force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.cmp | 316 ++++++++++++++++++++++
force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayRenderer.js | 5
force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayController.js | 9
10 files changed, 838 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.auradoc b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.auradoc
new file mode 100644
index 0000000..d0d6eb5
--- /dev/null
+++ b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.auradoc
@@ -0,0 +1,6 @@
+<aura:documentation>
+ <aura:description>Documentation</aura:description>
+ <aura:example name="ExampleName" ref="exampleComponentName" label="Label">
+ Example Description
+ </aura:example>
+</aura:documentation>
\ No newline at end of file
diff --git a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.cmp b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.cmp
new file mode 100644
index 0000000..c21f55e
--- /dev/null
+++ b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.cmp
@@ -0,0 +1,316 @@
+<aura:component implements="flexipage:availableForAllPageTypes,forceCommunity:availableForAllPageTypes,lightning:isUrlAddressable" access="global" controller="AttachmentDisplayController">
+ <aura:attribute name="DNId" type="String"
+ description="鐢ㄦ潵浠庣埗瀵硅薄鎺ユ敹浼犻�掕繃鏉ョ殑绛炬敹鍗昳d"
+ default=""/>
+ <aura:handler name="init" action="{!c.doInit}" value="{!this}"
+ description="鍒濆鍖栨柟娉�"/>
+ <aura:attribute name="currentData" type="Object[]" description="鏄庣粏椤靛綋鍓嶆樉绀虹殑鏄庣粏鐨勪俊鎭�" />
+ <div>
+ <lightning:spinner aura:id="mySpinner" alternativeText='璇风瓑寰�' size="large" class="slds-spinner_container"/>
+ </div>
+ <div id="allDivs" >
+ <div id="ins" style=" width:1150px;margin-right: 4px; ">
+ <!-- 鏄剧ず鍦ㄦ槑缁嗛〉鐨勫綋鍓嶆槑缁嗙殑琛ㄦ牸 -->
+ <div id="inTables">
+ <!-- <lightning:card> -->
+ <aura:set attribute="title">
+ 杩涘彛鍗曡瘉鏄庣粏
+ </aura:set>
+ <table class="slds-table slds-table_cell-buffer slds-table_bordered slds-hint-parent slds-no-row-hover " style="border-collapse: collapse;border-color:#D7D7D7;" border="1px " >
+ <thead>
+ <tr class="slds-line-height_reset slds-text-title_caps">
+ <!-- 绗竴鍒� 浜у搧鏄庣粏 -->
+ <!-- <th class="slds-is-resizable" tabindex="-1" data-label="浜у搧鏄庣粏" scope="row">
+ <span class="slds-grid slds-grid_align-spread" style="width: 120px;text-align: left;display:block;">
+ <div class="slds-truncate">
+ <span title="浜у搧鏄庣粏" class="slds-truncate" style="padding-bottom: 3px;">浜у搧鏄庣粏</span>
+ </div>
+ </span>
+ </th> -->
+ <th class="slds-is-resizable" tabindex="-1" data-label="浜у搧鏄庣粏" scope="row" style="width: 146px;position:static">
+ <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
+ <div class="slds-truncate">
+ <span title="浜у搧鏄庣粏" class="slds-truncate" style="padding-bottom: 3px;">浜у搧鏄庣粏</span>
+ </div>
+ </span>
+ </th>
+ <!-- 绗簩鍒� 鏈鸿韩缂栫爜 -->
+ <th class="slds-is-resizable" tabindex="-1" data-label="鏈鸿韩缂栫爜" scope="row" style="width: 240px;height: 35px;">
+ <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
+ <div class="slds-truncate">
+ <span title="鏈鸿韩缂栫爜" class="slds-truncate" style="padding-bottom: 3px;">鏈鸿韩缂栫爜</span>
+ </div>
+ </span>
+ </th>
+ <!-- 绗笁鍒� 绠＄悊缂栫爜 -->
+ <th class="slds-is-resizable" tabindex="-1" data-label="绠＄悊缂栫爜" scope="row" style="width: 240px;height: 35px;">
+ <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
+ <div class="slds-truncate">
+ <span title="绠＄悊缂栫爜" class="slds-truncate" style="padding-bottom: 3px;">绠＄悊缂栫爜</span>
+ </div>
+ </span>
+ </th>
+ <!-- 绗洓鍒� 棰勮閾炬帴 -->
+ <!-- <th class="slds-is-resizable" tabindex="-1" data-label="棰勮閾炬帴" scope="row" style="width: 249px;height: 35px;">
+ <span class="slds-grid slds-grid_align-spread" style="text-align: center;display:block;">
+ <div class="slds-truncate">
+ <span title="棰勮閾炬帴" class="slds-truncate" style="padding-bottom: 3px;">棰勮閾炬帴</span>
+ </div>
+ </span>
+ </th> -->
+ <!-- 绗簲鍒� 鎶ュ叧鍗曚笅杞介摼鎺� -->
+ <th class="slds-is-resizable" tabindex="-1" data-label="鎶ュ叧鍗�" scope="row" style="width: 249px;">
+ <span class="slds-grid slds-grid_align-spread" style="width: 240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <span title="鎶ュ叧鍗曚笅杞介摼鎺�" class="slds-truncate" style="padding-bottom: 3px;">鎶ュ叧鍗曚笅杞介摼鎺�</span>
+ </div>
+ </span>
+ </th>
+ <!-- 绗叚鍒� 鍟嗘璇佷笅杞介摼鎺� -->
+ <th class="slds-is-resizable" tabindex="-1" data-label="鍟嗘璇�" scope="row" style="width: 249px;">
+ <span class="slds-grid slds-grid_align-spread" style="width: 240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <span title="鍟嗘璇佷笅杞介摼鎺�" class="slds-truncate" style="padding-bottom: 3px;">鍟嗘璇佷笅杞介摼鎺�</span>
+ </div>
+ </span>
+ </th>
+ </tr>
+ </thead>
+ <aura:if isTrue="{!v.currentData.length > 0}">
+ <tbody>
+ <aura:iteration items="{!v.currentData}" var="curr" >
+ <tr class="slds-hint-parent">
+ <!-- 琛岄」鐩� 绗竴鍒� 浜у搧鏄庣粏-->
+ <!-- <th class="slds-is-resizable" tabindex="-1" data-label="DN鍗曞彿" >
+ <span class="slds-grid slds-grid_align-spread" style="width: 140px;height:18px;text-align: left;display:block;border: bottom 1px;">
+ <lightning:formattedText value="{!curr.Name}" style="padding-bottom: 3px;"/>
+ </span>
+ </th> -->
+ <th class="slds-is-resizable" tabindex="-1" data-label="浜у搧鏄庣粏" style="width: 146px;height:36px;position:static">
+ <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
+ <div class="slds-truncate">
+ <lightning:formattedText value="{!curr.ProductName}" style="padding-bottom: 3px;"/>
+ </div>
+ </span>
+ </th>
+ <!-- 琛岄」鐩� 绗簩鍒� 鏈鸿韩缂栫爜-->
+ <th class="slds-is-resizable" tabindex="-1" data-label="鏈鸿韩缂栫爜" style="width: 240px;height: 35px;">
+ <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
+ <div class="slds-truncate">
+ <lightning:formattedText value="{!curr.FrameNo}" style="padding-bottom: 3px;"/>
+ </div>
+ </span>
+ </th>
+ <!-- 琛岄」鐩� 绗笁鍒� 绠＄悊缂栫爜-->
+ <th class="slds-is-resizable" tabindex="-1" data-label="绠＄悊缂栫爜" style="width: 240px;height: 35px;">
+ <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
+ <div class="slds-truncate">
+ <lightning:formattedText value="{!curr.Name}" style="padding-bottom: 3px;"/>
+ </div>
+ </span>
+ </th>
+ <!-- 琛岄」鐩� 绗洓鍒� 棰勮閾炬帴-->
+ <!-- <aura:if isTrue="{!IF(curr.count ==null,false,true)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="棰勮閾炬帴" style="width: 240px;height: 35px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="text-align: center;display:block;">
+ <div class="slds-truncate"> -->
+ <!-- <lightning:formattedText value="{!curr.Name}" style="padding-bottom: 3px;"/> -->
+ <!-- <a href="{!curr.code}">棰勮</a>
+ </div>
+ </span>
+ </th>
+ </aura:if> -->
+ <!-- 琛岄」鐩� 绗簲鍒� 鎶ュ叧鍗曚笅杞介摼鎺�-->
+ <aura:if isTrue="{!IF(curr.code =='鍥藉唴閲囪喘',false,true)}">
+ <aura:if isTrue="{!IF(curr.count ==null,false,true)}">
+ <!-- <aura:if isTrue="{!IF(curr.code !='鏃�' ,true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鎶ュ叧鍗�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
+ <div class="slds-truncate"> -->
+ <!-- <lightning:formattedText value="{!curr.code}" style="padding-bottom: 3px;"/> rowspan="{!curr.count}"-->
+ <!-- <a href="{!curr.codeyu}">棰勮</a>
+
+ <a href="{!curr.code}">涓嬭浇</a>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ <aura:if isTrue="{!IF(curr.code =='鏃�' ,true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鎶ュ叧鍗�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
+ <div class="slds-truncate"> -->
+ <!-- <a href="{!curr.code}">{!curr.code}</a> -->
+ <!-- </div>
+ </span>
+ </th>
+ </aura:if> -->
+ <aura:if isTrue="{!IF(curr.code =='涓嶅嚭璇�' ,true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鎶ュ叧鍗�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <lightning:formattedText value="{!curr.code}" style="padding-bottom: 3px;"/>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ <aura:if isTrue="{!IF(curr.code !='涓嶅嚭璇�' ,true,false)}">
+ <aura:if isTrue="{!IF(AND(curr.code =='',curr.codeyu ==''),true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鎶ュ叧鍗�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <lightning:formattedText value="{!curr.code}" style="padding-bottom: 3px;"/>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ <aura:if isTrue="{!IF(AND(curr.code =='',curr.codeyu !=''),true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鎶ュ叧鍗�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=preview&key=' + curr.awsKey + '&name=' + curr.fileName}" target="_blank">棰勮</a>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ <aura:if isTrue="{!IF(AND(curr.code !='',curr.codeyu ==''),true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鎶ュ叧鍗�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <!-- <a href="/eSignSystem/apex/FilePreviewDownVF?type=download&key={!curr.awsKey}&name={!curr.fileName}" target="_blank">涓嬭浇</a> -->
+ <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=download&key=' + curr.awsKey + '&name=' + curr.fileName}" target="_blank">涓嬭浇</a>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ <aura:if isTrue="{!IF(AND(curr.code !='',curr.codeyu !=''),true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鎶ュ叧鍗�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <!-- <a href="/eSignSystem/apex/FilePreviewDownVF?type=preview&key={!curr.awsKey}&name={!curr.fileName}" target="_blank">棰勮</a> | <a href="/eSignSystem/apex/FilePreviewDownVF?type=download&key={!curr.awsKey}&name={!curr.fileName}" target="_blank">涓嬭浇</a> -->
+ <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=preview&key=' + curr.awsKey + '&name=' + curr.fileName}" target="_blank">棰勮</a> | <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=download&key=' + curr.awsKey + '&name=' + curr.fileName}" target="_blank">涓嬭浇</a>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ </aura:if>
+ </aura:if>
+ </aura:if>
+ <aura:if isTrue="{!IF(curr.code =='鍥藉唴閲囪喘',true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鎶ュ叧鍗�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ 鍥藉唴閲囪喘
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ <!-- 琛岄」鐩� 绗叚鍒� 鍟嗘璇佷笅杞介摼鎺�-->
+ <aura:if isTrue="{!IF(curr.sj_code =='鍥藉唴閲囪喘',false,true)}">
+ <aura:if isTrue="{!IF(curr.count ==null,false,true)}">
+ <!-- <aura:if isTrue="{!IF(AND(curr.sj_code !='涓嶅嚭璇�',curr.sj_code !='') ,true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鍟嗘璇�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width: 240px;text-align: center;display:block;">
+ <div class="slds-truncate"> -->
+ <!-- <lightning:formattedText value="{!curr.code}" style="padding-bottom: 3px;"/> -->
+ <!-- <a href="{!curr.sj_codeyu}">棰勮</a>
+
+ <a href="{!curr.sj_code}">涓嬭浇</a>
+ </div>
+ </span>
+ </th>
+ </aura:if> -->
+ <!-- <aura:if isTrue="{!IF(curr.sj_code =='涓嶅嚭璇�' ,true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鍟嗘璇�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width: 240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <lightning:formattedText value="{!curr.sj_code}" style="padding-bottom: 3px;"/> -->
+ <!-- <a href="{!curr.code}">涓嬭浇</a> -->
+ <!-- </div>
+ </span>
+ </th>
+ </aura:if>
+ <aura:if isTrue="{!IF(AND(curr.sj_code !='涓嶅嚭璇�',curr.sj_code =='') ,true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鍟嗘璇�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width: 240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ </div>
+ </span>
+ </th>
+ </aura:if>-->
+
+ <aura:if isTrue="{!IF(curr.sj_code =='涓嶅嚭璇�' ,true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鍟嗘璇�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <lightning:formattedText value="{!curr.sj_code}" style="padding-bottom: 3px;"/>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ <aura:if isTrue="{!IF(curr.sj_code !='涓嶅嚭璇�' ,true,false)}">
+ <aura:if isTrue="{!IF(AND(curr.sj_code =='',curr.sj_codeyu ==''),true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鍟嗘璇�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <lightning:formattedText value="{!curr.sj_code}" style="padding-bottom: 3px;"/>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ <aura:if isTrue="{!IF(AND(curr.sj_code =='',curr.sj_codeyu !=''),true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鍟嗘璇�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <!-- <a href="/eSignSystem/apex/FilePreviewDownVF?type=preview&key={!curr.sj_awsKey}&name={!curr.sj_fileName}" target="_blank">棰勮</a> -->
+ <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=preview&key=' + curr.sj_awsKey + '&name=' + curr.sj_fileName}" target="_blank">棰勮</a>
+
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ <aura:if isTrue="{!IF(AND(curr.sj_code !='',curr.sj_codeyu ==''),true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鍟嗘璇�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <!-- <a href="/eSignSystem/apex/FilePreviewDownVF?type=download&key={!curr.sj_awsKey}&name={!curr.sj_fileName}" target="_blank">涓嬭浇</a> -->
+ <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=download&key=' + curr.sj_awsKey + '&name=' + curr.sj_fileName}" target="_blank">涓嬭浇</a>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ <aura:if isTrue="{!IF(AND(curr.sj_code !='',curr.sj_codeyu !=''),true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鍟嗘璇�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <!-- <a href="/eSignSystem/apex/FilePreviewDownVF?type=preview&key={!curr.sj_awsKey}&name={!curr.sj_fileName}" target="_blank">棰勮</a> | <a href="/eSignSystem/apex/FilePreviewDownVF?type=download&key={!curr.sj_awsKey}&name={!curr.sj_fileName}" target="_blank">涓嬭浇</a> -->
+ <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=preview&key=' + curr.sj_awsKey + '&name=' + curr.sj_fileName}" target="_blank">棰勮</a> | <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=download&key=' + curr.sj_awsKey + '&name=' + curr.sj_fileName}" target="_blank">涓嬭浇</a>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ </aura:if>
+ </aura:if>
+ </aura:if>
+ <aura:if isTrue="{!IF(curr.sj_code =='鍥藉唴閲囪喘',true,false)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鍟嗘璇�" style="width: 249px;" rowspan="{!curr.count}">
+ <span class="slds-grid slds-grid_align-spread" style="width: 240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ 鍥藉唴閲囪喘
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ </tr>
+ </aura:iteration>
+ </tbody>
+ </aura:if>
+ </table>
+ <aura:if isTrue="{!empty(v.currentData)}">
+ <div class="slds-align_absolute-center">
+ No records found
+ </div>
+ </aura:if>
+ </div>
+ </div>
+ </div>
+</aura:component>
\ No newline at end of file
diff --git a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.cmp-meta.xml b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.cmp-meta.xml
new file mode 100644
index 0000000..119345a
--- /dev/null
+++ b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.cmp-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>55.0</apiVersion>
+ <description>A Lightning Component Bundle</description>
+</AuraDefinitionBundle>
diff --git a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.css b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.css
new file mode 100644
index 0000000..a5839d4
--- /dev/null
+++ b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.css
@@ -0,0 +1,2 @@
+.THIS {
+}
\ No newline at end of file
diff --git a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.design b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.design
new file mode 100644
index 0000000..d247163
--- /dev/null
+++ b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.design
@@ -0,0 +1,3 @@
+<design:component >
+
+</design:component>
\ No newline at end of file
diff --git a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.svg b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.svg
new file mode 100644
index 0000000..e201ae9
--- /dev/null
+++ b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<svg width="120px" height="120px" viewBox="0 0 120 120" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <path d="M120,108 C120,114.6 114.6,120 108,120 L12,120 C5.4,120 0,114.6 0,108 L0,12 C0,5.4 5.4,0 12,0 L108,0 C114.6,0 120,5.4 120,12 L120,108 L120,108 Z" id="Shape" fill="#2A739E" />
+ <path d="M77.7383308,20 L61.1640113,20 L44.7300055,63.2000173 L56.0543288,63.2000173 L40,99.623291 L72.7458388,54.5871812 L60.907727,54.5871812 L77.7383308,20 Z" id="Path-1" fill="#FFFFFF" />
+ </g>
+</svg>
\ No newline at end of file
diff --git a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayController.js b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayController.js
new file mode 100644
index 0000000..b185cde
--- /dev/null
+++ b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayController.js
@@ -0,0 +1,9 @@
+({
+ myAction : function(component, event, helper) {
+
+ },
+ doInit : function(cmp, event, helper) {
+ // 璁剧疆鏄庣粏椤佃〃鏍肩殑鏋勯��
+ helper.getFrameNumManage(cmp);
+ }
+})
\ No newline at end of file
diff --git a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayHelper.js b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayHelper.js
new file mode 100644
index 0000000..b2819b6
--- /dev/null
+++ b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayHelper.js
@@ -0,0 +1,33 @@
+({
+ // 鑾峰彇鏁版嵁
+ getFrameNumManage : function(cmp) {
+ debugger
+ // this.showSpinner(cmp);
+ var action = cmp.get("c.getFrameNumManage");
+ var DNId = cmp.get('v.DNId').toString();
+ action.setParams({
+ 'DNId' : DNId,
+ });
+ action.setCallback(this,function(response) {
+ var state = response.getState();
+ console.log(state);
+ if (state === "SUCCESS") {
+ var resultData = response.getReturnValue();
+ cmp.set("v.currentData", resultData);
+ this.hideSpinner(cmp);
+ }else{
+ cmp.set("v.errorMessage", '鍔犺浇澶辫触锛岃閲嶆柊鎵撳紑姝ら〉闈紒');
+ }
+ });
+ $A.enqueueAction(action);
+ },
+ showSpinner: function(cmp) {
+ debugger
+ var spinner = cmp.find("mySpinner");
+ $A.util.removeClass(spinner, "slds-hide");
+ },
+ hideSpinner: function(cmp) {
+ var spinner = cmp.find("mySpinner");
+ $A.util.addClass(spinner, "slds-hide");
+ },
+})
\ No newline at end of file
diff --git a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayRenderer.js b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayRenderer.js
new file mode 100644
index 0000000..f1f0c75
--- /dev/null
+++ b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayRenderer.js
@@ -0,0 +1,5 @@
+({
+
+// Your renderer method overrides go here
+
+})
\ No newline at end of file
diff --git a/force-app/main/default/classes/AttachmentDisplayController.cls b/force-app/main/default/classes/AttachmentDisplayController.cls
new file mode 100644
index 0000000..8b36c5c
--- /dev/null
+++ b/force-app/main/default/classes/AttachmentDisplayController.cls
@@ -0,0 +1,452 @@
+public without sharing class AttachmentDisplayController {
+ @AuraEnabled
+ public static List<testInit> getFrameNumManage(String DNId){
+ //zhj 鍒ゆ柇鏄惁鏄痵ite绔欑偣鍜岄摼鎺ヤ笂闈㈡槸鍚﹀瓨鍦╡SignSystem 2023-01-04 start
+ String ourl =URL.getsalesforceBaseUrl().toExternalForm();
+ String path =URL.getcurrentRequesturl().getPath();
+ Boolean bool = false;
+ if(ourl.contains('site') && path.contains('eSignSystem')){
+ bool = true;
+ }
+ System.debug('bool = ' + bool);
+ //zhj 鍒ゆ柇鏄惁鏄痵ite绔欑偣鍜岄摼鎺ヤ笂闈㈡槸鍚﹀瓨鍦╡SignSystem 2023-01-04 end
+
+ System.debug('DNId'+DNId);
+ List<testInit> newinitList = new List<testInit>();
+ List<testInit> initList = new List<testInit>();
+ List<FrameNumManage__c> FnmList =[SELECT Id, Name ,ManagementCode__c,InspectionCard__c
+ , ApplyList__c ,InspectionCard_Select__c ,InspectionCard_Select__r.ViewLink__c
+ ,InspectionCard_Select__r.DownloadLink__c, ApplyList_Select__c
+ ,ApplyList_Select__r.DownloadLink__c,ApplyList_Select__r.ViewLink__c, Num__c
+ , SerialNumber__c,Material__c , MaterialDepict__c
+ ,ApplyList_Select__r.AWS_File_Key__c,ApplyList_Select__r.FileName__c
+ ,InspectionCard_Select__r.AWS_File_Key__c,InspectionCard_Select__r.FileName__c
+ ,HomeBuy__c
+ from FrameNumManage__c where signInForm__c =:DNId order by ApplyList__c desc,SerialNumber__c desc];
+ set<String> FileStrSet = new set<String>();
+ List<FileAddress__c> FileList = new List<FileAddress__c>();
+ Map<String,String> FileStrMap = new Map<String,String>();
+ // if (FnmList.size()>0) {
+ // for (FrameNumManage__c nObj : FnmList ) {
+ // FileStrSet.add(nObj.ApplyList__c);
+ // }
+ // FileList = [SELECT Id, Name, FileName__c,ViewLink__c FROM FileAddress__c WHERE FileName__c IN: FileStrSet];
+ // if(FileList.size()>0){
+ // for (FileAddress__c file : FileList) {
+ // FileStrMap.put(file.FileName__c, file.ViewLink__c);
+ // }
+ // }
+ // }
+ List<FrameNumManage__c> FnmListhomebuy = new List<FrameNumManage__c>();
+ List<FrameNumManage__c> notFnmListhomebuy = new List<FrameNumManage__c>();
+ for(FrameNumManage__c fr : FnmList){
+ if(fr.HomeBuy__c){
+ FnmListhomebuy.add(fr);
+ }else{
+ notFnmListhomebuy.add(fr);
+ }
+ }
+ Integer n = 0; // 鍒濆鍖栧悎骞惰鏁�
+ for (Integer i=0;i<notFnmListhomebuy.size() ;i++ ) {
+ testInit init = new testInit();
+ if (i==0) {
+ init.Name = notFnmListhomebuy[i].ManagementCode__c;
+ init.ProductName = notFnmListhomebuy[i].Material__c + '-' + notFnmListhomebuy[i].MaterialDepict__c;
+
+ //2022-12-26 fy add 鏀归�� start
+ // init.code = notFnmListhomebuy[i].ApplyList__c;
+ // if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.DownloadLink__c)) {
+ // init.code = notFnmListhomebuy[i].ApplyList_Select__r.DownloadLink__c;
+ // init.codeyu = notFnmListhomebuy[i].ApplyList_Select__r.ViewLink__c;
+ // }else{
+ // init.code = '鏃�';
+ // }
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList__c)) {
+ if (notFnmListhomebuy[i].ApplyList__c.equals('涓嶅嚭璇�')) {
+ init.code = '涓嶅嚭璇�';
+ }else{
+ // 鎶ュ叧鍗曢瑙堥摼鎺ュ垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.ViewLink__c)) {
+ init.codeyu = notFnmListhomebuy[i].ApplyList_Select__r.ViewLink__c;
+ }else{
+ init.codeyu = '';
+ }
+ // 鎶ュ叧鍗曚笅杞介摼鎺ュ垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.DownloadLink__c)) {
+ init.code = notFnmListhomebuy[i].ApplyList_Select__r.DownloadLink__c;
+ }else{
+ init.code = '';
+ }
+
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.AWS_File_Key__c)) {
+ init.awsKey = notFnmListhomebuy[i].ApplyList_Select__r.AWS_File_Key__c;
+ }else{
+ init.awsKey = '';
+ }
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.FileName__c)) {
+ init.fileName = notFnmListhomebuy[i].ApplyList_Select__r.FileName__c;
+ }else{
+ init.fileName = '';
+ }
+ }
+ }else{
+ init.code = '';
+ init.codeyu = '';
+ init.awsKey = '';
+ init.fileName = '';
+ }
+ // //2022-12-05 fy add 鎶ュ叧鍗曞垽鏂�
+ // //if (String.isNotBlank(FnmList[i].InspectionCard_Select__r.DownloadLink__c)) {
+ // if (notFnmListhomebuy[i].InspectionCard__c =='涓嶅嚭璇�') {
+ // init.sj_code = '涓嶅嚭璇�';
+ // }else if(String.isBlank(notFnmListhomebuy[i].InspectionCard_Select__r.DownloadLink__c)){
+ // init.sj_code = '';
+ // }else{
+ // init.sj_code = notFnmListhomebuy[i].InspectionCard_Select__r.DownloadLink__c;
+ // init.sj_codeyu = notFnmListhomebuy[i].InspectionCard_Select__r.ViewLink__c;
+ // } //2022-12-05 fy add 鍟嗘璇佸垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard__c)) {
+ if (notFnmListhomebuy[i].InspectionCard__c.equals('涓嶅嚭璇�')) {
+ init.sj_code = '涓嶅嚭璇�';
+ }else{
+ // 鍟嗘璇侀瑙堥摼鎺ュ垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard_Select__r.ViewLink__c)) {
+ init.sj_codeyu = notFnmListhomebuy[i].InspectionCard_Select__r.ViewLink__c;
+ }else{
+ init.sj_codeyu = '';
+ }
+ // 鍟嗘璇佷笅杞介摼鎺ュ垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard_Select__r.DownloadLink__c)) {
+ init.sj_code = notFnmListhomebuy[i].InspectionCard_Select__r.DownloadLink__c;
+ }else{
+ init.sj_code = '';
+ }
+ //鍟嗘璇乤wkey,filename鍒ゆ柇 zhj 2022-12-19 start
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard_Select__r.AWS_File_Key__c)) {
+ init.sj_awsKey = notFnmListhomebuy[i].InspectionCard_Select__r.AWS_File_Key__c;
+ }else{
+ init.sj_awsKey = '';
+ }
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard_Select__r.FileName__c)) {
+ init.sj_fileName = notFnmListhomebuy[i].InspectionCard_Select__r.FileName__c;
+ }else{
+ init.sj_fileName = '';
+ }
+ //鍟嗘璇乤wkey,filename鍒ゆ柇 zhj 2022-12-19 end
+ }
+ }else{
+ init.sj_code = '';
+ init.sj_codeyu = '';
+ init.sj_awsKey = ''; // zhj 2022-12-19
+ init.sj_fileName = ''; // zhj 2022-12-19
+ }
+ //2022-12-26 fy add 鏀归�� end
+
+ // init.code = FileStrMap.get(FnmList[i].ApplyList__c);
+ init.Num = notFnmListhomebuy[i].Num__c;
+ init.Id = notFnmListhomebuy[i].Id;
+ init.FrameNo = notFnmListhomebuy[i].SerialNumber__c;
+ n = n+1;
+ if (i != notFnmListhomebuy.size()-1) {
+ // 鍒ゆ柇绗竴涓笌绗簩涓槸鍚︿竴鏍凤紝涓嶄竴鏍疯祴鍊�1
+ if (notFnmListhomebuy[i].ApplyList__c != notFnmListhomebuy[i+1].ApplyList__c) {
+ init.count = n;
+ }
+ }else if(notFnmListhomebuy.size() == 1){
+ init.count = 1;
+ }
+ System.debug('init1===='+init);
+ }else {
+ // 鍒ゆ柇涓庡墠涓�涓紪鐮佹槸涓�鑷�
+ if (notFnmListhomebuy[i].ApplyList__c == notFnmListhomebuy[i-1].ApplyList__c) {
+ init.Name = notFnmListhomebuy[i].ManagementCode__c;
+ init.ProductName = notFnmListhomebuy[i].Material__c + '-' + notFnmListhomebuy[i].MaterialDepict__c;
+
+ //2022-12-26 fy add 鏀归�� start
+ // // init.code = notFnmListhomebuy[i].ApplyList__c;
+ // if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.DownloadLink__c)) {
+ // init.code = notFnmListhomebuy[i].ApplyList_Select__r.DownloadLink__c;
+ // init.codeyu = notFnmListhomebuy[i].ApplyList_Select__r.ViewLink__c;
+ // }else{
+ // init.code = '鏃�';
+ // } //2022-12-05 fy add 鎶ュ叧鍗曞垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList__c)) {
+ if (notFnmListhomebuy[i].ApplyList__c.equals('涓嶅嚭璇�')) {
+ init.code = '涓嶅嚭璇�';
+ }else{
+ // 鎶ュ叧鍗曢瑙堥摼鎺ュ垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.ViewLink__c)) {
+ init.codeyu = notFnmListhomebuy[i].ApplyList_Select__r.ViewLink__c;
+ }else{
+ init.codeyu = '';
+ }
+ // 鎶ュ叧鍗曚笅杞介摼鎺ュ垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.DownloadLink__c)) {
+ init.code = notFnmListhomebuy[i].ApplyList_Select__r.DownloadLink__c;
+ }else{
+ init.code = '';
+ }
+ //鎶ュ叧鍗昦wkey,filename鍒ゆ柇 zhj 2022-12-08 start
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.AWS_File_Key__c)) {
+ init.awsKey = notFnmListhomebuy[i].ApplyList_Select__r.AWS_File_Key__c;
+ }else{
+ init.awsKey = '';
+ }
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.FileName__c)) {
+ init.fileName = notFnmListhomebuy[i].ApplyList_Select__r.FileName__c;
+ }else{
+ init.fileName = '';
+ }
+ //鎶ュ叧鍗昦wkey,filename鍒ゆ柇 zhj 2022-12-08 end
+ }
+ }else{
+ init.code = '';
+ init.codeyu = '';
+ init.awsKey = ''; // zhj 2022-12-08
+ init.fileName = ''; // zhj 2022-12-08
+ }
+ //if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard_Select__r.DownloadLink__c)) {
+ // if (notFnmListhomebuy[i].InspectionCard__c =='涓嶅嚭璇�') {
+ // init.sj_code = '涓嶅嚭璇�';
+ // }else if(String.isBlank(notFnmListhomebuy[i].InspectionCard_Select__r.DownloadLink__c)){
+ // init.sj_code = '';
+ // }else{
+ // init.sj_code = notFnmListhomebuy[i].InspectionCard_Select__r.DownloadLink__c;
+ // init.sj_codeyu = notFnmListhomebuy[i].InspectionCard_Select__r.ViewLink__c;
+ // }
+ // //2022-12-05 fy add 鍟嗘璇佸垽鏂�
+
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard__c)) {
+ if (notFnmListhomebuy[i].InspectionCard__c.equals('涓嶅嚭璇�')) {
+ init.sj_code = '涓嶅嚭璇�';
+ }else{
+ // 鍟嗘璇侀瑙堥摼鎺ュ垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard_Select__r.ViewLink__c)) {
+ init.sj_codeyu = notFnmListhomebuy[i].InspectionCard_Select__r.ViewLink__c;
+ }else{
+ init.sj_codeyu = '';
+ }
+ // 鍟嗘璇佷笅杞介摼鎺ュ垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard_Select__r.DownloadLink__c)) {
+ init.sj_code = notFnmListhomebuy[i].InspectionCard_Select__r.DownloadLink__c;
+ }else{
+ init.sj_code = '';
+ }
+ //鍟嗘璇乤wkey,filename鍒ゆ柇 zhj 2022-12-19 start
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard_Select__r.AWS_File_Key__c)) {
+ init.sj_awsKey = notFnmListhomebuy[i].InspectionCard_Select__r.AWS_File_Key__c;
+ }else{
+ init.sj_awsKey = '';
+ }
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard_Select__r.FileName__c)) {
+ init.sj_fileName = notFnmListhomebuy[i].InspectionCard_Select__r.FileName__c;
+ }else{
+ init.sj_fileName = '';
+ }
+ //鍟嗘璇乤wkey,filename鍒ゆ柇 zhj 2022-12-19 end
+ }
+ }else{
+ init.sj_code = '';
+ init.sj_codeyu = '';
+ init.sj_awsKey = ''; // zhj 2022-12-19
+ init.sj_fileName = ''; // zhj 2022-12-19
+ }
+ //2022-12-26 fy add 鏀归�� end
+
+ // init.code = FileStrMap.get(notFnmListhomebuy[i].ApplyList__c);
+ init.Num = notFnmListhomebuy[i].Num__c;
+ init.Id = notFnmListhomebuy[i].Id;
+ init.FrameNo = notFnmListhomebuy[i].SerialNumber__c;
+ n = n+1;
+ // 鍒ゆ柇鏄笉鏄渶鍚庝竴涓�
+ if (i != notFnmListhomebuy.size()-1) {
+ // 涓嶆槸鏈�鍚庝竴涓紝鍒ゆ柇涓庝笅涓�涓紪鐮佷竴鑷翠笉涓�鑷达紝涓嶄竴鑷寸洿鎺ヨ祴鍊�
+ if (notFnmListhomebuy[i].ApplyList__c != notFnmListhomebuy[i+1].ApplyList__c) {
+ init.count = n;
+ }
+ }
+ // 鏈�鍚庝竴涓洿鎺ヨ祴鍊�
+ if (i == notFnmListhomebuy.size()-1) {
+ init.count = n;
+ }
+ System.debug('init2===='+init);
+ }else {
+ // 涓嬩竴缁勫紑濮�
+ n = 0;
+ init.Name = notFnmListhomebuy[i].ManagementCode__c;
+ init.ProductName = notFnmListhomebuy[i].Material__c + '-' + notFnmListhomebuy[i].MaterialDepict__c;
+ // init.code = notFnmListhomebuy[i].ApplyList__c;
+
+ //2022-12-26 fy add 鏀归�� start
+ // if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.DownloadLink__c)) {
+ // init.code = notFnmListhomebuy[i].ApplyList_Select__r.DownloadLink__c;
+ // init.codeyu = notFnmListhomebuy[i].ApplyList_Select__r.ViewLink__c;
+ // }else{
+ // init.code = '鏃�';
+ // } //2022-12-05 fy add 鎶ュ叧鍗曞垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList__c)) {
+ if (notFnmListhomebuy[i].ApplyList__c.equals('涓嶅嚭璇�')) {
+ init.code = '涓嶅嚭璇�';
+ }else{
+ // 鎶ュ叧鍗曢瑙堥摼鎺ュ垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.ViewLink__c)) {
+ init.codeyu = notFnmListhomebuy[i].ApplyList_Select__r.ViewLink__c;
+ }else{
+ init.codeyu = '';
+ }
+ // 鎶ュ叧鍗曚笅杞介摼鎺ュ垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.DownloadLink__c)) {
+ init.code = notFnmListhomebuy[i].ApplyList_Select__r.DownloadLink__c;
+ }else{
+ init.code = '';
+ }
+ //鎶ュ叧鍗昦wkey,filename鍒ゆ柇 zhj 2022-12-08 start
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.AWS_File_Key__c)) {
+ init.awsKey = notFnmListhomebuy[i].ApplyList_Select__r.AWS_File_Key__c;
+ }else{
+ init.awsKey = '';
+ }
+ if (String.isNotBlank(notFnmListhomebuy[i].ApplyList_Select__r.FileName__c)) {
+ init.fileName = notFnmListhomebuy[i].ApplyList_Select__r.FileName__c;
+ }else{
+ init.fileName = '';
+ }
+ //鎶ュ叧鍗昦wkey,filename鍒ゆ柇 zhj 2022-12-08 end
+ }
+ }else{
+ init.code = '';
+ init.codeyu = '';
+ init.awsKey = ''; // zhj 2022-12-08
+ init.fileName = ''; // zhj 2022-12-08
+ }
+ //if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard_Select__r.DownloadLink__c)) {
+ // if (notFnmListhomebuy[i].InspectionCard__c =='涓嶅嚭璇�') {
+ // init.sj_code = '涓嶅嚭璇�';
+ // }else if(String.isBlank(notFnmListhomebuy[i].InspectionCard_Select__r.DownloadLink__c)){
+ // init.sj_code = '';
+ // }else{
+ // init.sj_code = notFnmListhomebuy[i].InspectionCard_Select__r.DownloadLink__c;
+ // init.sj_codeyu = notFnmListhomebuy[i].InspectionCard_Select__r.ViewLink__c;
+ // }
+ //2022-12-05 fy add 鍟嗘璇佸垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard__c)) {
+ if (notFnmListhomebuy[i].InspectionCard__c.equals('涓嶅嚭璇�')) {
+ init.sj_code = '涓嶅嚭璇�';
+ }else{
+ // 鍟嗘璇侀瑙堥摼鎺ュ垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard_Select__r.ViewLink__c)) {
+ init.sj_codeyu = notFnmListhomebuy[i].InspectionCard_Select__r.ViewLink__c;
+ }else{
+ init.sj_codeyu = '';
+ }
+ // 鍟嗘璇佷笅杞介摼鎺ュ垽鏂�
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard_Select__r.DownloadLink__c)) {
+ init.sj_code = notFnmListhomebuy[i].InspectionCard_Select__r.DownloadLink__c;
+ }else{
+ init.sj_code = '';
+ }
+ //鍟嗘璇乤wkey,filename鍒ゆ柇 zhj 2022-12-19 start
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard_Select__r.AWS_File_Key__c)) {
+ init.sj_awsKey = notFnmListhomebuy[i].InspectionCard_Select__r.AWS_File_Key__c;
+ }else{
+ init.sj_awsKey = '';
+ }
+ if (String.isNotBlank(notFnmListhomebuy[i].InspectionCard_Select__r.FileName__c)) {
+ init.sj_fileName = notFnmListhomebuy[i].InspectionCard_Select__r.FileName__c;
+ }else{
+ init.sj_fileName = '';
+ }
+ //鍟嗘璇乤wkey,filename鍒ゆ柇 zhj 2022-12-19 end
+ }
+ }else{
+ init.sj_code = '';
+ init.sj_codeyu = '';
+ init.sj_awsKey = ''; // zhj 2022-12-19
+ init.sj_fileName = ''; // zhj 2022-12-19
+ }
+ //2022-12-26 fy add 鏀归�� end
+
+ // init.code = FileStrMap.get(notFnmListhomebuy[i].ApplyList__c);
+ init.Num = notFnmListhomebuy[i].Num__c;
+ init.Id = notFnmListhomebuy[i].Id;
+ init.FrameNo = notFnmListhomebuy[i].SerialNumber__c;
+ n = n+1;
+ if((i<notFnmListhomebuy.size()-1 && notFnmListhomebuy[i].ApplyList__c != notFnmListhomebuy[i+1].ApplyList__c)||(i == notFnmListhomebuy.size()-1)){
+ init.count =n;
+ }
+ System.debug('init3===='+init);
+ }
+ }
+ //zhj 濡傛灉鏄痚SignSystem闇�瑕佸姞涓婅繖涓墠缂�閾炬帴 2023-01-04 start
+ if(bool){
+ init.iseSignSystem = '/eSignSystem';
+ }else {
+ init.iseSignSystem = '';
+ }
+ //zhj 濡傛灉鏄痚SignSystem闇�瑕佸姞涓婅繖涓墠缂�閾炬帴 2023-01-04 end
+ initList.add(init);
+ }
+ List<testInit> newinitListhomebuy = new List<testInit>();
+ for(FrameNumManage__c fr : FnmListhomebuy){
+ testInit init = new testInit();
+ init.Name=fr.ManagementCode__c;
+ init.ProductName=fr.Material__c + '-' + fr.MaterialDepict__c;
+ init.FrameNo=fr.SerialNumber__c;
+ init.code='鍥藉唴閲囪喘';
+ init.sj_code='鍥藉唴閲囪喘';
+ init.Num=fr.Num__c;
+ init.Id=fr.Id;
+ init.count=1;
+ newinitListhomebuy.add(init);
+ }
+ // 鍊掑簭鏄剧ず
+ for (Integer i = initList.size()-1; i>=0 ; i--) {
+ testInit init = new testInit();
+ init = initList[i];
+ newinitList.add(init);
+ }
+ // newinitList.addAll(newinitListhomebuy);
+ newinitListhomebuy.addAll(newinitList);
+ newinitList=newinitListhomebuy;
+ System.debug('newinitList'+newinitList);
+ System.debug('FnmList'+FnmList);
+ System.debug('newinitListhomebuy'+newinitListhomebuy);
+ return newinitList;
+
+ }
+ // 瀹氫箟鍐呴儴绫伙紝鑷畾涔夊弬鏁�
+ class testInit{
+ @AuraEnabled
+ public Boolean check;
+ @AuraEnabled
+ public String Name;
+ @AuraEnabled
+ public String ProductName;
+ @AuraEnabled
+ public String FrameNo;
+ @AuraEnabled
+ public String code;
+ @AuraEnabled
+ public String codeyu;
+ @AuraEnabled
+ public String sj_code;
+ @AuraEnabled
+ public String sj_codeyu;
+ @AuraEnabled
+ public Decimal Num;
+ @AuraEnabled
+ public String Id;
+ @AuraEnabled
+ public Integer count;
+ @AuraEnabled
+ public String awsKey;
+ @AuraEnabled
+ public String fileName;
+ @AuraEnabled
+ public String sj_awsKey;
+ @AuraEnabled
+ public String sj_fileName;
+ @AuraEnabled
+ public String iseSignSystem; //zhj 绔欑偣閾炬帴 2023-01-04
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.1