parent: 5c4f90ca | 补丁 | 提交 | ignore whitespace
李金换
2022-03-25 666c757b7ec18a501c50aa740507ab5db5fea16d 
LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备
2个文件已修改
35 ■■■■■ 已修改文件
force-app/main/default/classes/SelectAssetEstimateVMController.cls 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/SelectAssetEstimateVM.page 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 force-app/main/default/classes/SelectAssetEstimateVMController.cls


@@ -238,10 +238,11 @@


        }


        //2021-11-30 fy add LJPH-C8W8FV 置顶 start OwnershipMachine_No__c Product2.ProductURF__c


        //tcm 添加 Management_Code__c  20211201 start


        //20220325 ljh LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 add CurrentContract_F__r.Is_Renewal__c  


        String soql = 'SELECT Id, Name,OwnershipMachine_No__c, Asset_situation__c, SerialNumber, Department_Name__c, Installation_Site__c, '


                      + 'Posting_Date__c,Management_Code__c,IF_Warranty__c,Reson_Can_not_Warranty__c, InstallDate,isNewDate_use__c, '


                      + 'Asset_Owner__c, Accumulation_Repair_Amount__c, Maintenance_Price_Month__c, Final_Examination_Date__c, '


                      + 'CurrentContract_F__c,CurrentContract_F__r.Maintenance_Contract_No_F__c,CurrentContract_F__r.Management_Code__c,CurrentContract_F__r.RecordType_DeveloperName__c,CurrentContract_F__r.Estimate_Num__c,CurrentContract_F__r.Contract_End_Date__c,'


                      + 'CurrentContract_F__c,CurrentContract_F__r.Maintenance_Contract_No_F__c,CurrentContract_F__r.Management_Code__c,CurrentContract_F__r.RecordType_DeveloperName__c,CurrentContract_F__r.Is_Renewal__c,CurrentContract_F__r.Estimate_Num__c,CurrentContract_F__r.Contract_End_Date__c,'


                      + 'CurrentContract_F_asset__c,CurrentContract_F_asset__r.Estimate_Cost_Month_formula__c,CurrentContract_F_asset__r.endDateGurantee_Text__c,CurrentContract_F__r.Gurantee_Estimate_startDate__c, '


                      + 'CurrentContract_F__r.First_Estimate_Date__c,CurrentContract_F__r.Estimate_Contract_endDate__c,'


                      + 'Product2.ProductURF__c,CurrentContract_F__r.Contract_Consumption_rate__c,CurrentContract_F__r.First_contract_usage_Rate__c,CurrentContract_F__r.Contract_Range__c,'


@@ -731,10 +732,11 @@


        // 納入機器の情報を取得


        if (!String.isBlank(this.targetHospitalId) && (this.targetHospitalId.length() == 15 || this.targetHospitalId.length() == 18)) {


            //2021-11-30 fy add LJPH-C8W8FV 置顶 start OwnershipMachine_No__c Product2.ProductURF__c


                  //tcm 添加 Management_Code__c  20211201 start


            //tcm 添加 Management_Code__c  20211201 start


            //20220325 ljh LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 add CurrentContract_F__r.Is_Renewal__c


            assetRecords = [SELECT Id, Name,OwnershipMachine_No__c,Product2.ProductURF__c, Asset_situation__c, SerialNumber, Department_Name__c, Installation_Site__c, Posting_Date__c, Management_Code__c, IF_Warranty__c, Reson_Can_not_Warranty__c,


                            InstallDate, isNewDate_use__c, Asset_Owner__c, Accumulation_Repair_Amount__c, Maintenance_Price_Month__c, Final_Examination_Date__c, CurrentContract_End_Date__c, EquipmentGuaranteeFlg__c,


                            CurrentContract_F__c, CurrentContract_F__r.Maintenance_Contract_No_F__c,CurrentContract_F__r.Management_Code__c, CurrentContract_F__r.RecordType_DeveloperName__c, CurrentContract_F__r.Estimate_Num__c, CurrentContract_F__r.Contract_End_Date__c, CurrentContract_F__r.Estimate_Contract_endDate__c,


                            CurrentContract_F__c, CurrentContract_F__r.Maintenance_Contract_No_F__c,CurrentContract_F__r.Management_Code__c, CurrentContract_F__r.RecordType_DeveloperName__c, CurrentContract_F__r.Is_Renewal__c, CurrentContract_F__r.Estimate_Num__c, CurrentContract_F__r.Contract_End_Date__c, CurrentContract_F__r.Estimate_Contract_endDate__c,


                            CurrentContract_F_asset__c, CurrentContract_F_asset__r.Estimate_Cost_Month_formula__c, CurrentContract_F_asset__r.endDateGurantee_Text__c, CurrentContract_F__r.Gurantee_Estimate_startDate__c,


                            CurrentContract_F__r.First_Estimate_Date__c,


                            CurrentContract_F__r.Contract_Consumption_rate__c, CurrentContract_F__r.First_contract_usage_Rate__c,


@@ -1083,12 +1085,13 @@


            }


            notInId += '\')';


            //2021-11-30 fy add LJPH-C8W8FV 置顶 start OwnershipMachine_No__c Product2.ProductURF__c


                //tcm 添加 Management_Code__c  20211201 start


            //tcm 添加 Management_Code__c  20211201 start


            //20220325 ljh LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 add CurrentContract_F__r.Is_Renewal__c


            String sqlStr = 'SELECT Id, Name,OwnershipMachine_No__c, Asset_situation__c, SerialNumber, Department_Name__c, Installation_Site__c, '


                            + 'Posting_Date__c,Management_Code__c,IF_Warranty__c,Reson_Can_not_Warranty__c, InstallDate,isNewDate_use__c, '


                            + 'Asset_Owner__c, Accumulation_Repair_Amount__c, Maintenance_Price_Month__c, Final_Examination_Date__c, '


                            + 'CurrentContract_End_Date__c, Extend_Gurantee_DateTo__c,EquipmentGuaranteeFlg__c, '


                            + 'CurrentContract_F__c,CurrentContract_F__r.Maintenance_Contract_No_F__c,CurrentContract_F__r.Management_Code__c,CurrentContract_F__r.RecordType_DeveloperName__c,CurrentContract_F__r.Estimate_Num__c,CurrentContract_F__r.Contract_End_Date__c,'


                            + 'CurrentContract_F__c,CurrentContract_F__r.Maintenance_Contract_No_F__c,CurrentContract_F__r.Management_Code__c,CurrentContract_F__r.RecordType_DeveloperName__c,CurrentContract_F__r.Is_Renewal__c, CurrentContract_F__r.Estimate_Num__c,CurrentContract_F__r.Contract_End_Date__c,'


                            + 'CurrentContract_F_asset__c,CurrentContract_F_asset__r.Estimate_Cost_Month_formula__c,CurrentContract_F_asset__r.endDateGurantee_Text__c,CurrentContract_F__r.Gurantee_Estimate_startDate__c, '


                            + 'CurrentContract_F__r.First_Estimate_Date__c,CurrentContract_F__r.Estimate_Contract_endDate__c,'


                            + 'CurrentContract_F__r.Contract_Consumption_rate__c,CurrentContract_F__r.First_contract_usage_Rate__c,'


@@ -1128,11 +1131,12 @@


            String sqlStr = '';


            //2021-11-30 fy add LJPH-C8W8FV 置顶 start OwnershipMachine_No__c Product2.ProductURF__c


            //tcm 添加 Management_Code__c  20211201 start


            //20220325 ljh LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 add CurrentContract_F__r.Is_Renewal__c


            sqlStr  = 'SELECT Id, Name,OwnershipMachine_No__c, Asset_situation__c, SerialNumber, Department_Name__c, Installation_Site__c,';


            sqlStr += 'Posting_Date__c,Management_Code__c,IF_Warranty__c,Reson_Can_not_Warranty__c,InstallDate,isNewDate_use__c,';


            sqlStr += 'Asset_Owner__c, Accumulation_Repair_Amount__c, Maintenance_Price_Month__c, Final_Examination_Date__c,';


            sqlStr += 'CurrentContract_End_Date__c,Extend_Gurantee_DateTo__c,EquipmentGuaranteeFlg__c,';


            sqlStr += 'CurrentContract_F__c,CurrentContract_F__r.Maintenance_Contract_No_F__c,CurrentContract_F__r.Management_Code__c,CurrentContract_F__r.RecordType_DeveloperName__c,CurrentContract_F__r.Estimate_Num__c,CurrentContract_F__r.Contract_End_Date__c,';


            sqlStr += 'CurrentContract_F__c,CurrentContract_F__r.Maintenance_Contract_No_F__c,CurrentContract_F__r.Management_Code__c,CurrentContract_F__r.RecordType_DeveloperName__c,CurrentContract_F__r.Is_Renewal__c,CurrentContract_F__r.Estimate_Num__c,CurrentContract_F__r.Contract_End_Date__c,';


            sqlStr += 'CurrentContract_F_asset__c,CurrentContract_F_asset__r.Estimate_Cost_Month_formula__c,CurrentContract_F_asset__r.endDateGurantee_Text__c,CurrentContract_F__r.Gurantee_Estimate_startDate__c,';


            sqlStr += 'CurrentContract_F__r.First_Estimate_Date__c,CurrentContract_F__r.Estimate_Contract_endDate__c,';


            sqlStr += 'Product2.ProductURF__c,CurrentContract_F__r.Contract_Consumption_rate__c,CurrentContract_F__r.First_contract_usage_Rate__c,';




 force-app/main/default/pages/SelectAssetEstimateVM.page


@@ -331,7 +331,7 @@


}




function refreshAsset(cnt) {


    //alert('1111111111');


    // alert(cnt);


    // 提交后就页面不计算了


    var isDisabled = {!PageDisabled};


    // 合同总理


@@ -411,6 +411,8 @@


                    strMoney = month * strMoney + month2 * strMoney;


                }


                var b = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contract_No')).value();


                var IsRenewal = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':IsRenewal')).value();


                // 20220325 ljh add  IsRenewal LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 start


                var LastMContractRecord = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':LastMContractRecord')).value();


                if(b != ''){


                    conCCount ++;


@@ -429,7 +431,10 @@


                    }


                    //最后结束日+1年


                    lastendDate.setMonth(lastendDate.getMonth() + 12);


                    if (Date.parse(contractStartDate) > Date.parse(lastendDate)) {


                    // 20220325 ljh update  IsRenewal 【委托】配合PBI设备覆盖率的数据准备 start


                    // if (Date.parse(contractStartDate) > Date.parse(lastendDate) ) {


                    if (Date.parse(contractStartDate) > Date.parse(lastendDate) && IsRenewal = true) {


                    // 20220325 ljh update  IsRenewal 【委托】配合PBI设备覆盖率的数据准备 end


                        oyearCount ++;


                    }


                    // 取联动价格


@@ -516,6 +521,8 @@


                strMoney = month * strMoney + month2 * strMoney;


            }


            var b = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contract_No')).value();


            var IsRenewal = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':IsRenewal')).value();


            // 20220325 ljh add  IsRenewal LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 


            var LastMContractRecord = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':LastMContractRecord')).value();


            if(b != ''){


                conCCount ++;


@@ -533,7 +540,10 @@


                }


                //最后结束日+1年


                lastendDate.setMonth(lastendDate.getMonth() + 12);


                if (Date.parse(contractStartDate) > Date.parse(lastendDate)) {


                // 20220325 ljh update  IsRenewal LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 start


                // if (Date.parse(contractStartDate) > Date.parse(lastendDate)) 


                if (Date.parse(contractStartDate) > Date.parse(lastendDate) && IsRenewal = true) {


                // 20220325 ljh update  IsRenewal LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 end


                    oyearCount ++;


                }


                // 取联动价格


@@ -1536,6 +1546,9 @@


                               


                                <td class="dataCell" width="70px">


                                    <apex:outputField value="{!ar.rec.CurrentContract_F__r.Maintenance_Contract_No_F__c}" rendered="{!Not(ar.IsManual)}" id="Contract_No"/>


                                    <!-- 20220325 ljh add  LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 start -->


                                    <apex:inputHidden value="{!ar.rec.CurrentContract_F__r.Is_Renewal__c}" id="IsRenewal"/>


                                    <!-- 20220325 ljh add start LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 end -->


                                    <apex:inputHidden value="{!ar.rec.CurrentContract_F__r.RecordType_DeveloperName__c}" id="LastMContractRecord"/>


                                    <apex:inputField value="{!ar.rec.CurrentContract_F_asset__r.endDateGurantee_Text__c}" id="endDateGurantee_Text" style="display: none" showDatePicker="false"/>


                                    <apex:inputHidden value="{!ar.rec.CurrentContract_F__c}" id="LastMContractID"/>