From 49aa73c32acfc151304683103ad633a27c7ab124 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期四, 17 三月 2022 22:13:00 +0800
Subject: [PATCH] PIPLFunctionDeployV5

---
 force-app/main/default/aura/NewAgencyContact/NewAgencyContact.cmp         |    2 +-
 force-app/main/default/pages/NewAndEditQIS.page                           |   14 +++++++++++++-
 force-app/main/default/classes/NewConsumApplyEquipSetDetailController.cls |   37 +++++++++++++++++--------------------
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/force-app/main/default/aura/NewAgencyContact/NewAgencyContact.cmp b/force-app/main/default/aura/NewAgencyContact/NewAgencyContact.cmp
index 281b5f5..d7c9ded 100644
--- a/force-app/main/default/aura/NewAgencyContact/NewAgencyContact.cmp
+++ b/force-app/main/default/aura/NewAgencyContact/NewAgencyContact.cmp
@@ -36,7 +36,7 @@
                                 <aura:iteration items="{! section.layoutColumns}" var="col">
                                     <aura:iteration items="{! col.layoutItems}" var="field">
                                         <aura:if isTrue="{! field.behavior != 'Readonly' }">
-                                        	<lightning:inputField required="{! field.behavior == 'Required' }" aura:id="{! field.field}" fieldName="{! field.field}" value="{! field.value}" />
+                                        	<lightning:inputField required="{! field.behavior == 'Required' }" aura:id="field" fieldName="{! field.field}" value="{! field.value}" />
                                             
                                         </aura:if>
                                     </aura:iteration>
diff --git a/force-app/main/default/classes/NewConsumApplyEquipSetDetailController.cls b/force-app/main/default/classes/NewConsumApplyEquipSetDetailController.cls
index b6c54ad..2fda9a3 100644
--- a/force-app/main/default/classes/NewConsumApplyEquipSetDetailController.cls
+++ b/force-app/main/default/classes/NewConsumApplyEquipSetDetailController.cls
@@ -69,28 +69,25 @@
         Consum_Apply_Equipment_Set_Detail__c consumApplyInfo = new Consum_Apply_Equipment_Set_Detail__c();
         //鑷畾涔夋牸寮忚浆鎹�
         for (String fieldAPI: fieldValueMap.keySet()) {
-            system.debug('field API'+fieldAPI);
-            String fieldValue = String.valueOf(fieldAPIToTypeMap.get(fieldAPI));
-            if(String.isBlank(fieldValue)){
-                continue;
-            }
-            Schema.DescribeFieldResult fielddataType = fieldAPIToTypeMap.get(fieldAPI).getDescribe();  
-            Schema.DisplayType fieldDatas = fielddataType.getType();
-            if(String.valueOf(fielddatas)=='DATE'){
-                consumApplyInfo.put(fieldAPI, Date.valueOf(String.valueOf(fieldValueMap.get(fieldAPI)).replace('/', '-')));
-            }else if(String.valueOf(fielddatas)=='DATETIME'){
-                String dt = String.valueOf(fieldValueMap.get(fieldAPI));
-                if(String.isNotBlank(dt)&&dt.contains('T')){
-                    dt = dt.replace('T',' ');
-                    consumApplyInfo.put(fieldAPI, Datetime.valueOfGmt(dt));
-                }             
-            }else if(String.valueOf(fielddatas)=='Number'||String.valueOf(fielddatas)=='DOUBLE'){
-                // ||String.valueOf(fielddatas)=='Decimal'
-                consumApplyInfo.put(fieldAPI, Decimal.valueOf(String.valueOf(fieldValueMap.get(fieldAPI))));
-            } else if(String.valueof(fielddatas)=='BOOLEAN'){
+            system.debug('field API='+fieldAPI);
+            Schema.DisplayType fielddataType = fieldAPIToTypeMap.get(fieldAPI).getDescribe().getType();  
+            String fieldValue = String.valueOf(fieldValueMap.get(fieldAPI)); 
+            system.debug('Field Type:'+fielddataType+' field Value='+fieldValue);
+            if(String.valueOf(fielddataType)=='DATE'){
+                consumApplyInfo.put(fieldAPI,(String.isBlank(fieldValue)||String.isEmpty(fieldValue))? null:Date.valueOf(fieldValue.replace('/', '-')));              
+            }else if(String.valueOf(fielddataType)=='DATETIME'){
+                if(String.isNotBlank(fieldValue)&&fieldValue.contains('T')){
+                    fieldValue = fieldValue.replace('T',' ');
+                    consumApplyInfo.put(fieldAPI, Datetime.valueOfGmt(fieldValue));
+                }else{
+                    consumApplyInfo.put(fieldAPI, null);
+                }                    
+            }else if(String.valueof(fielddataType)=='CURRENCY'|| String.valueof(fielddataType)=='PERCENT'||String.valueOf(fielddataType)=='Number'||String.valueOf(fielddataType)=='DOUBLE' ){
+                consumApplyInfo.put(fieldAPI, (String.isBlank(fieldValue)||String.isEmpty(fieldValue))?0:Decimal.valueOf(fieldValue)); 
+            } else if(String.valueof(fielddataType)=='BOOLEAN'){
                 consumApplyInfo.put(fieldAPI, fieldValueMap.get(fieldAPI));
             }else {
-                consumApplyInfo.put(fieldAPI, String.valueOf(fieldValueMap.get(fieldAPI)));
+                consumApplyInfo.put(fieldAPI,fieldValue);
             }                  
         }
         
diff --git a/force-app/main/default/pages/NewAndEditQIS.page b/force-app/main/default/pages/NewAndEditQIS.page
index 1f2a6ee..05bef34 100644
--- a/force-app/main/default/pages/NewAndEditQIS.page
+++ b/force-app/main/default/pages/NewAndEditQIS.page
@@ -557,7 +557,19 @@
                 if (!{!isNewMode}) {
                     blockme();
                     QuerySobjectFromAWS();
-                }
+                }else{
+                        let ot = jQuery('input[data-id="OwnerId"]');
+                        let oi = document.getElementById(ot.attr("id")+'_lkid');
+                        ot.val('{!CurrentUserName}');
+                        ot.attr("readonly","");
+                        ot.css("background","unset");
+                        ot.css("border","0");
+                        ot.css( "outline","0");
+                        jQuery('a[data-id="OwnerId"]').remove();
+                        if(oi){
+                            oi.value = '{!CurrentUserId}'
+                        }
+                    }
             });
             </script>
             <div class="pbBottomButtons">

--
Gitblit v1.9.1