From de9565270a88b0749d17c1961cd41399c8483c96 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 17:46:45 +0800
Subject: [PATCH] merge

---
 force-app/main/default/classes/updateESignBatchTest.cls | 3185 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1,705 insertions(+), 1,480 deletions(-)

diff --git a/force-app/main/default/classes/updateESignBatchTest.cls b/force-app/main/default/classes/updateESignBatchTest.cls
index a6134f2..92a4473 100644
--- a/force-app/main/default/classes/updateESignBatchTest.cls
+++ b/force-app/main/default/classes/updateESignBatchTest.cls
@@ -2,93 +2,110 @@
 private class updateESignBatchTest {
     //娴嬭瘯缁忛攢鍟嗘敹璐�
     static testMethod void testMethod1() {
-    	 List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
         if (rectCo.size() == 0) {
             return;
         }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
         if (rectSct.size() == 0) {
             return;
         }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
         if (rectDpt.size() == 0) {
             return;
         }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
         if (rectAs.size() == 0) {
             return;
         }
 
-     
         // insert hospital
         Account company1 = new Account();
         company1.RecordTypeId = rectCo[0].Id;
         company1.Name = '鐥呴櫌銉嗐偣銉�1';
         company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
+        List<Account> hps = new List<Account>{ company1 };
         insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
         Account depart1 = new Account();
         depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
         depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
+        depart1.Hospital__c = company1.Id;
         depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
+
+        insert new List<Account>{ depart1 };
 
         List<Product2> prdList = new List<Product2>();
         Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
         prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
         prd1.Extend_new_product_gurantee__c = true;
         prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
         prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
         prdList.add(prd1);
         insert prdList;
-    
+
         Asset ast = new Asset();
 
         ast.RecordTypeId = rectAs[0].Id;
         ast.SerialNumber = 'abcdefg';
         ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
         ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
+        ast.InstallDate = Date.today();
         ast.Manage_type__c = '涓綋绠$悊';
         ast.FirstApproveDate_old__c = Date.today().addDays(-30);
 
         Oly_TriggerHandler.bypass('AssetHandler');
 
         insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
-        String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
 
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
+        String RecordTypeID = ast1.RecordTypeID__c;
+
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
         Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = '璨╁2搴�',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp,
-               Trade__c = '鍐呰部'
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = '璨╁2搴�',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp,
+            Trade__c = '鍐呰部'
         );
         insert opp;
 
@@ -103,34 +120,32 @@
         insert Sac;
 
         //鏂板缓鐢靛瓙绛炬敹鍗�
-    	eSignForm__c eSignForm = new eSignForm__c();
-    	eSignForm.Statu_Achievements__c = Sac.Id;
-    	eSignForm.Name = '::娴嬭瘯鐢靛瓙绛炬敹鍗�';
+        eSignForm__c eSignForm = new eSignForm__c();
+        eSignForm.Statu_Achievements__c = Sac.Id;
+        eSignForm.Name = '::娴嬭瘯鐢靛瓙绛炬敹鍗�';
 
-
-    	insert eSignForm;
+        insert eSignForm;
 
         eSignFormEntry__c eSignFormEntry1 = new eSignFormEntry__c();
         eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃1';
         eSignFormEntry1.eSignForm__c = eSignForm.Id;
         eSignFormEntry1.entryType__c = '缁忛攢鍟嗘敹璐�';
-        
+
         insert eSignFormEntry1;
 
-    	eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
-    	eSignFormEntry2.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃2';
-    	eSignFormEntry2.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry2.entryType__c = '缁忛攢鍟嗘敹璐�';
+        eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
+        eSignFormEntry2.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃2';
+        eSignFormEntry2.eSignForm__c = eSignForm.Id;
+        eSignFormEntry2.entryType__c = '缁忛攢鍟嗘敹璐�';
         eSignFormEntry2.IsSubmit__c = true;
         eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
-        eSignFormEntry2.agencySignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.agencyConfirmDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPScanDayBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPSignUpDateBack__c =Date.today().addDays(-2);
+        eSignFormEntry2.agencySignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencyConfirmDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPSignUpDateBack__c = Date.today().addDays(-2);
         eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
-    	// eSignFormEntry2.createdDate = Date.today().addDays(-2);
-    	insert eSignFormEntry2;
-
+        // eSignFormEntry2.createdDate = Date.today().addDays(-2);
+        insert eSignFormEntry2;
 
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
         eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
@@ -143,42 +158,41 @@
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
-        eSignFormLineItemEntry1.eSignFormEntry__c =eSignFormEntry1.Id;
+        eSignFormLineItemEntry1.eSignFormEntry__c = eSignFormEntry1.Id;
         eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry1;
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
-        eSignFormLineItemEntry2.eSignFormEntry__c =eSignFormEntry2.Id;
+        eSignFormLineItemEntry2.eSignFormEntry__c = eSignFormEntry2.Id;
         eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry2;
 
-        list<Attachment> attachmentList = new list<Attachment>();
-        Attachment attach=new Attachment();     
-        attach.Name='Unit Test Attachment';
-        Blob bodyBlob=Blob.valueOf('Unit Test Attachment Body');
-        attach.body=bodyBlob;
-        attach.parentId=eSignFormEntry2.id;
+        list<Attachment> attachmentList = new List<Attachment>();
+        Attachment attach = new Attachment();
+        attach.Name = 'Unit Test Attachment';
+        Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+        attach.body = bodyBlob;
+        attach.parentId = eSignFormEntry2.id;
         attach.ContentType = 'application/pdf';
 
         attachmentList.add(attach);
 
         // insert attach;
-        Attachment attach1=new Attachment();     
-        attach1.Name='Unit Test Attachment';
-        Blob bodyBlob1=Blob.valueOf('Unit Test Attachment Body');
-        attach1.body=bodyBlob1;
-        attach1.parentId=eSignForm.id;
+        Attachment attach1 = new Attachment();
+        attach1.Name = 'Unit Test Attachment';
+        Blob bodyBlob1 = Blob.valueOf('Unit Test Attachment Body');
+        attach1.body = bodyBlob1;
+        attach1.parentId = eSignForm.id;
         attach1.ContentType = 'application/pdf';
-        
+
         attachmentList.add(attach1);
 
         insert attachmentList;
 
         Test.startTest();
-
 
         Database.executeBatch(new updateESignBatch(), 20);
         Test.stopTest();
@@ -186,92 +200,109 @@
 
     //娴嬭瘯缁忛攢鍟嗙‘璁�
     static testMethod void testMethod2() {
-         List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
         if (rectCo.size() == 0) {
             return;
         }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
         if (rectSct.size() == 0) {
             return;
         }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
         if (rectDpt.size() == 0) {
             return;
         }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
         if (rectAs.size() == 0) {
             return;
         }
 
-     
         // insert hospital
         Account company1 = new Account();
         company1.RecordTypeId = rectCo[0].Id;
         company1.Name = '鐥呴櫌銉嗐偣銉�1';
         company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
+        List<Account> hps = new List<Account>{ company1 };
         insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
         Account depart1 = new Account();
         depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
         depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
+        depart1.Hospital__c = company1.Id;
         depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
+
+        insert new List<Account>{ depart1 };
 
         List<Product2> prdList = new List<Product2>();
         Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
         prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
         prd1.Extend_new_product_gurantee__c = true;
         prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
         prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
         prdList.add(prd1);
         insert prdList;
-    
+
         Asset ast = new Asset();
 
         ast.RecordTypeId = rectAs[0].Id;
         ast.SerialNumber = 'abcdefg';
         ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
         ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
+        ast.InstallDate = Date.today();
         ast.Manage_type__c = '涓綋绠$悊';
         ast.FirstApproveDate_old__c = Date.today().addDays(-30);
 
         Oly_TriggerHandler.bypass('AssetHandler');
 
         insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
-        String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
 
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
+        String RecordTypeID = ast1.RecordTypeID__c;
+
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
         Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = '璨╁2搴�',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = '璨╁2搴�',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp
         );
         insert opp;
 
@@ -296,7 +327,7 @@
         eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃1';
         eSignFormEntry1.eSignForm__c = eSignForm.Id;
         eSignFormEntry1.entryType__c = '缁忛攢鍟嗙‘璁�';
-        
+
         insert eSignFormEntry1;
 
         eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
@@ -305,14 +336,13 @@
         eSignFormEntry2.entryType__c = '缁忛攢鍟嗙‘璁�';
         eSignFormEntry2.IsSubmit__c = true;
         eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
-        eSignFormEntry2.agencySignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.agencyConfirmDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPScanDayBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPSignUpDateBack__c =Date.today().addDays(-2);
+        eSignFormEntry2.agencySignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencyConfirmDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPSignUpDateBack__c = Date.today().addDays(-2);
         eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
         // eSignFormEntry2.createdDate = Date.today().addDays(-2);
         insert eSignFormEntry2;
-
 
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
         eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
@@ -325,36 +355,36 @@
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
-        eSignFormLineItemEntry1.eSignFormEntry__c =eSignFormEntry1.Id;
+        eSignFormLineItemEntry1.eSignFormEntry__c = eSignFormEntry1.Id;
         eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry1;
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
-        eSignFormLineItemEntry2.eSignFormEntry__c =eSignFormEntry2.Id;
+        eSignFormLineItemEntry2.eSignFormEntry__c = eSignFormEntry2.Id;
         eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry2;
 
-        list<Attachment> attachmentList = new list<Attachment>();
-        Attachment attach=new Attachment();     
-        attach.Name='Unit Test Attachment';
-        Blob bodyBlob=Blob.valueOf('Unit Test Attachment Body');
-        attach.body=bodyBlob;
-        attach.parentId=eSignFormEntry2.id;
-        attach.ContentType='image/jpeg';
+        list<Attachment> attachmentList = new List<Attachment>();
+        Attachment attach = new Attachment();
+        attach.Name = 'Unit Test Attachment';
+        Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+        attach.body = bodyBlob;
+        attach.parentId = eSignFormEntry2.id;
+        attach.ContentType = 'image/jpeg';
 
         attachmentList.add(attach);
 
         // insert attach;
-        Attachment attach1=new Attachment();     
-        attach1.Name='Unit Test Attachment';
-        Blob bodyBlob1=Blob.valueOf('Unit Test Attachment Body');
-        attach1.body=bodyBlob1;
-        attach1.parentId=eSignForm.id;
-        attach1.ContentType='image/jpeg';
-        
+        Attachment attach1 = new Attachment();
+        attach1.Name = 'Unit Test Attachment';
+        Blob bodyBlob1 = Blob.valueOf('Unit Test Attachment Body');
+        attach1.body = bodyBlob1;
+        attach1.parentId = eSignForm.id;
+        attach1.ContentType = 'image/jpeg';
+
         attachmentList.add(attach1);
 
         insert attachmentList;
@@ -367,93 +397,110 @@
 
     //娴嬭瘯鍖婚櫌鏀惰揣
     static testMethod void testMethod3() {
-         List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
         if (rectCo.size() == 0) {
             return;
         }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
         if (rectSct.size() == 0) {
             return;
         }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
         if (rectDpt.size() == 0) {
             return;
         }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
         if (rectAs.size() == 0) {
             return;
         }
 
-     
         // insert hospital
         Account company1 = new Account();
         company1.RecordTypeId = rectCo[0].Id;
         company1.Name = '鐥呴櫌銉嗐偣銉�1';
         company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
+        List<Account> hps = new List<Account>{ company1 };
         insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
         Account depart1 = new Account();
         depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
         depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
+        depart1.Hospital__c = company1.Id;
         depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
+
+        insert new List<Account>{ depart1 };
 
         List<Product2> prdList = new List<Product2>();
         Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
         prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
         prd1.Extend_new_product_gurantee__c = true;
         prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
         prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
         prdList.add(prd1);
         insert prdList;
-    
+
         Asset ast = new Asset();
 
         ast.RecordTypeId = rectAs[0].Id;
         ast.SerialNumber = 'abcdefg';
         ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
         ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
+        ast.InstallDate = Date.today();
         ast.Manage_type__c = '涓綋绠$悊';
         ast.FirstApproveDate_old__c = Date.today().addDays(-30);
 
         Oly_TriggerHandler.bypass('AssetHandler');
 
         insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
-        String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
 
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
+        String RecordTypeID = ast1.RecordTypeID__c;
+
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
         Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = '璨╁2搴�',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp,
-               Trade__c = '鍐呰部'
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = '璨╁2搴�',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp,
+            Trade__c = '鍐呰部'
         );
         insert opp;
 
@@ -478,7 +525,7 @@
         eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃1';
         eSignFormEntry1.eSignForm__c = eSignForm.Id;
         eSignFormEntry1.entryType__c = '鍖婚櫌鏀惰揣';
-        
+
         insert eSignFormEntry1;
 
         eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
@@ -487,14 +534,13 @@
         eSignFormEntry2.entryType__c = '鍖婚櫌鏀惰揣';
         eSignFormEntry2.IsSubmit__c = true;
         eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
-        eSignFormEntry2.agencySignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.agencyConfirmDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPScanDayBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPSignUpDateBack__c =Date.today().addDays(-2);
+        eSignFormEntry2.agencySignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencyConfirmDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPSignUpDateBack__c = Date.today().addDays(-2);
         eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
         // eSignFormEntry2.createdDate = Date.today().addDays(-2);
         insert eSignFormEntry2;
-
 
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
         eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
@@ -507,34 +553,34 @@
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
-        eSignFormLineItemEntry1.eSignFormEntry__c =eSignFormEntry1.Id;
+        eSignFormLineItemEntry1.eSignFormEntry__c = eSignFormEntry1.Id;
         eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry1;
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
-        eSignFormLineItemEntry2.eSignFormEntry__c =eSignFormEntry2.Id;
+        eSignFormLineItemEntry2.eSignFormEntry__c = eSignFormEntry2.Id;
         eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry2;
 
-        list<Attachment> attachmentList = new list<Attachment>();
-        Attachment attach=new Attachment();     
-        attach.Name='Unit Test Attachment';
-        Blob bodyBlob=Blob.valueOf('Unit Test Attachment Body');
-        attach.body=bodyBlob;
-        attach.parentId=eSignFormEntry2.id;
+        list<Attachment> attachmentList = new List<Attachment>();
+        Attachment attach = new Attachment();
+        attach.Name = 'Unit Test Attachment';
+        Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+        attach.body = bodyBlob;
+        attach.parentId = eSignFormEntry2.id;
 
         attachmentList.add(attach);
 
         // insert attach;
-        Attachment attach1=new Attachment();     
-        attach1.Name='Unit Test Attachment';
-        Blob bodyBlob1=Blob.valueOf('Unit Test Attachment Body');
-        attach1.body=bodyBlob1;
-        attach1.parentId=eSignForm.id;
-        
+        Attachment attach1 = new Attachment();
+        attach1.Name = 'Unit Test Attachment';
+        Blob bodyBlob1 = Blob.valueOf('Unit Test Attachment Body');
+        attach1.body = bodyBlob1;
+        attach1.parentId = eSignForm.id;
+
         attachmentList.add(attach1);
 
         insert attachmentList;
@@ -546,93 +592,110 @@
 
     //娴嬭瘯鍖婚櫌纭
     static testMethod void testMethod4() {
-         List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
         if (rectCo.size() == 0) {
             return;
         }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
         if (rectSct.size() == 0) {
             return;
         }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
         if (rectDpt.size() == 0) {
             return;
         }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
         if (rectAs.size() == 0) {
             return;
         }
 
-     
         // insert hospital
         Account company1 = new Account();
         company1.RecordTypeId = rectCo[0].Id;
         company1.Name = '鐥呴櫌銉嗐偣銉�1';
         company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
+        List<Account> hps = new List<Account>{ company1 };
         insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
         Account depart1 = new Account();
         depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
         depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
+        depart1.Hospital__c = company1.Id;
         depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
+
+        insert new List<Account>{ depart1 };
 
         List<Product2> prdList = new List<Product2>();
         Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
         prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
         prd1.Extend_new_product_gurantee__c = true;
         prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
         prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
         prdList.add(prd1);
         insert prdList;
-    
+
         Asset ast = new Asset();
 
         ast.RecordTypeId = rectAs[0].Id;
         ast.SerialNumber = 'abcdefg';
         ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
         ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
+        ast.InstallDate = Date.today();
         ast.Manage_type__c = '涓綋绠$悊';
         ast.FirstApproveDate_old__c = Date.today().addDays(-30);
 
         Oly_TriggerHandler.bypass('AssetHandler');
 
         insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
-        String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
 
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
+        String RecordTypeID = ast1.RecordTypeID__c;
+
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
         Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = '璨╁2搴�',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp,
-               Trade__c = '鍐呰部'
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = '璨╁2搴�',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp,
+            Trade__c = '鍐呰部'
         );
         insert opp;
 
@@ -657,7 +720,7 @@
         eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃1';
         eSignFormEntry1.eSignForm__c = eSignForm.Id;
         eSignFormEntry1.entryType__c = '鍖婚櫌纭';
-        
+
         insert eSignFormEntry1;
 
         eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
@@ -666,14 +729,13 @@
         eSignFormEntry2.entryType__c = '鍖婚櫌纭';
         eSignFormEntry2.IsSubmit__c = true;
         eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
-        eSignFormEntry2.agencySignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.agencyConfirmDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPScanDayBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPSignUpDateBack__c =Date.today().addDays(-2);
+        eSignFormEntry2.agencySignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencyConfirmDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPSignUpDateBack__c = Date.today().addDays(-2);
         eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
         // eSignFormEntry2.createdDate = Date.today().addDays(-2);
         insert eSignFormEntry2;
-
 
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
         eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
@@ -686,34 +748,34 @@
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
-        eSignFormLineItemEntry1.eSignFormEntry__c =eSignFormEntry1.Id;
+        eSignFormLineItemEntry1.eSignFormEntry__c = eSignFormEntry1.Id;
         eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry1;
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
-        eSignFormLineItemEntry2.eSignFormEntry__c =eSignFormEntry2.Id;
+        eSignFormLineItemEntry2.eSignFormEntry__c = eSignFormEntry2.Id;
         eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry2;
 
-        list<Attachment> attachmentList = new list<Attachment>();
-        Attachment attach=new Attachment();     
-        attach.Name='Unit Test Attachment';
-        Blob bodyBlob=Blob.valueOf('Unit Test Attachment Body');
-        attach.body=bodyBlob;
-        attach.parentId=eSignFormEntry2.id;
+        list<Attachment> attachmentList = new List<Attachment>();
+        Attachment attach = new Attachment();
+        attach.Name = 'Unit Test Attachment';
+        Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+        attach.body = bodyBlob;
+        attach.parentId = eSignFormEntry2.id;
 
         attachmentList.add(attach);
 
         // insert attach;
-        Attachment attach1=new Attachment();     
-        attach1.Name='Unit Test Attachment';
-        Blob bodyBlob1=Blob.valueOf('Unit Test Attachment Body');
-        attach1.body=bodyBlob1;
-        attach1.parentId=eSignForm.id;
-        
+        Attachment attach1 = new Attachment();
+        attach1.Name = 'Unit Test Attachment';
+        Blob bodyBlob1 = Blob.valueOf('Unit Test Attachment Body');
+        attach1.body = bodyBlob1;
+        attach1.parentId = eSignForm.id;
+
         attachmentList.add(attach1);
 
         insert attachmentList;
@@ -724,546 +786,111 @@
         Test.stopTest();
     }
 
-
     static testMethod void testMethod5() {
-    	 List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
         if (rectCo.size() == 0) {
             return;
         }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
         if (rectSct.size() == 0) {
             return;
         }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
         if (rectDpt.size() == 0) {
             return;
         }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
         if (rectAs.size() == 0) {
             return;
         }
 
-     
         // insert hospital
         Account company1 = new Account();
         company1.RecordTypeId = rectCo[0].Id;
         company1.Name = '鐥呴櫌銉嗐偣銉�1';
         company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
+        List<Account> hps = new List<Account>{ company1 };
         insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
         Account depart1 = new Account();
         depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
         depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
+        depart1.Hospital__c = company1.Id;
         depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
+
+        insert new List<Account>{ depart1 };
 
         List<Product2> prdList = new List<Product2>();
         Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
         prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
         prd1.Extend_new_product_gurantee__c = true;
         prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
         prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
         prdList.add(prd1);
         insert prdList;
-    
+
         Asset ast = new Asset();
 
         ast.RecordTypeId = rectAs[0].Id;
         ast.SerialNumber = 'abcdefg';
         ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
         ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
+        ast.InstallDate = Date.today();
         ast.Manage_type__c = '涓綋绠$悊';
         ast.FirstApproveDate_old__c = Date.today().addDays(-30);
 
         Oly_TriggerHandler.bypass('AssetHandler');
 
         insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
+
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
         String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
 
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
         Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = 'OCM鐩存帴璨╁2',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp,
-               Trade__c = '鍐呰部'
-        );
-        insert opp;
-        //娉ㄦ畫
-        Statu_Achievements__c Sac = new Statu_Achievements__c(
-            name = 'zhucan_one',
-            Opportunity__c = opp.id,
-            DeliveryDate__c = Date.today(),
-            ContractNO__c = 'ContractNO1',
-            ContractAmount__c = 1000
-        );
-        insert Sac;
-
-        //鏂板缓鐢靛瓙绛炬敹鍗�
-    	eSignForm__c eSignForm = new eSignForm__c();
-    	eSignForm.Statu_Achievements__c = Sac.Id;
-    	eSignForm.Name = '::娴嬭瘯鐢靛瓙绛炬敹鍗�';
-
-    	insert eSignForm;
-
-    	//鏂板缓鐢靛瓙绛炬敹鍗�7
-    	eSignFormEntry__c eSignFormEntry = new eSignFormEntry__c();
-    	eSignFormEntry.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry.entryType__c = '缁忛攢鍟嗘敹璐�';
-    	// eSignFormEntry.createdDate = Date.today().addDays(-7);
-    	insert eSignFormEntry;
-
-    	eSignFormEntry__c eSignFormEntry1 = new eSignFormEntry__c();
-    	eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry1.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry1.entryType__c = '缁忛攢鍟嗘敹璐�';
-    	// eSignFormEntry1.createdDate = Date.today().addDays(-3);
-    	insert eSignFormEntry1;
-
-    	eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
-    	eSignFormEntry2.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry2.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry2.entryType__c = '缁忛攢鍟嗘敹璐�';
-        eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
-        eSignFormEntry2.agencySignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.agencyConfirmDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPScanDayBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPSignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
-    	// eSignFormEntry2.createdDate = Date.today().addDays(-2);
-    	insert eSignFormEntry2;
-
-    	eSignFormEntry__c eSignFormEntry3 = new eSignFormEntry__c();
-    	eSignFormEntry3.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry3.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry3.entryType__c = '缁忛攢鍟嗙‘璁�';
-    	// eSignFormEntry3.createdDate = Date.today().addDays(-7);
-    	insert eSignFormEntry3;
-
-    	eSignFormEntry__c eSignFormEntry4 = new eSignFormEntry__c();
-    	eSignFormEntry4.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry4.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry4.entryType__c = '缁忛攢鍟嗙‘璁�';
-    	// eSignFormEntry4.createdDate = Date.today().addDays(-2);
-    	insert eSignFormEntry4;
-
-    	eSignFormEntry__c eSignFormEntry5 = new eSignFormEntry__c();
-    	eSignFormEntry5.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry5.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry5.entryType__c = '鍖婚櫌鏀惰揣';
-    	// eSignFormEntry5.createdDate = Date.today().addDays(-7);
-    	insert eSignFormEntry5;
-
-    	eSignFormEntry__c eSignFormEntry6 = new eSignFormEntry__c();
-    	eSignFormEntry6.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry6.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry6.entryType__c = '鍖婚櫌鏀惰揣';
-    	// eSignFormEntry6.createdDate = Date.today().addDays(-2);
-    	insert eSignFormEntry6;
-
-        eSignFormEntry__c eSignFormEntry8 = new eSignFormEntry__c();
-        eSignFormEntry8.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-        eSignFormEntry8.eSignForm__c = eSignForm.Id;
-        eSignFormEntry8.entryType__c = '鍖婚櫌纭';
-
-        insert eSignFormEntry8;
-
-        eSignFormEntry__c eSignFormEntry7 = new eSignFormEntry__c();
-        eSignFormEntry7.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-        eSignFormEntry7.eSignForm__c = eSignForm.Id;
-        eSignFormEntry7.entryType__c = '鍖婚櫌纭';
-        
-        insert eSignFormEntry7;
-
-        //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
-        eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
-        eSignFormLineItem.Name = '::鐢靛瓙绛炬敹鍗曟槑缁�';
-        eSignFormLineItem.eSignForm__c = eSignForm.Id;
-
-        insert eSignFormLineItem;
-
-        //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏ヨ〃
-        eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
-        eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
-        eSignFormLineItemEntry1.eSignFormEntry__c =eSignFormEntry2.Id;
-        eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
-
-        insert eSignFormLineItemEntry1;
-
-        eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
-        eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
-        eSignFormLineItemEntry2.eSignFormEntry__c =eSignFormEntry2.Id;
-        eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
-
-        insert eSignFormLineItemEntry2;
-
-    	list<Attachment> attachmentList = new list<Attachment>();
-        Attachment attach=new Attachment();     
-        attach.Name='Unit Test Attachment';
-        Blob bodyBlob=Blob.valueOf('Unit Test Attachment Body');
-        attach.body=bodyBlob;
-        attach.parentId=eSignFormEntry2.id;
-
-        attachmentList.add(attach);
-
-        // insert attach;
-        Attachment attach1=new Attachment();     
-        attach1.Name='Unit Test Attachment';
-        Blob bodyBlob1=Blob.valueOf('Unit Test Attachment Body');
-        attach1.body=bodyBlob1;
-        attach1.parentId=eSignForm.id;
-        
-        attachmentList.add(attach1);
-
-        insert attachmentList;
-
-        Test.startTest();
-
-        Date d = Date.today();
-        Database.executeBatch(new updateESignBatch(d), 20);
-        Test.stopTest();
-    }
-
-    static testMethod void testMethod6() {
-    	 List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
-        if (rectCo.size() == 0) {
-            return;
-        }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
-        if (rectSct.size() == 0) {
-            return;
-        }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
-        if (rectDpt.size() == 0) {
-            return;
-        }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
-        if (rectAs.size() == 0) {
-            return;
-        }
-
-     
-        // insert hospital
-        Account company1 = new Account();
-        company1.RecordTypeId = rectCo[0].Id;
-        company1.Name = '鐥呴櫌銉嗐偣銉�1';
-        company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
-        insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
-        Account depart1 = new Account();
-        depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
-        depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
-        depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
-
-        List<Product2> prdList = new List<Product2>();
-        Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
-        prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
-        prd1.Extend_new_product_gurantee__c = true;
-        prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
-        prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
-        prdList.add(prd1);
-        insert prdList;
-    
-        Asset ast = new Asset();
-
-        ast.RecordTypeId = rectAs[0].Id;
-        ast.SerialNumber = 'abcdefg';
-        ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
-        ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
-        ast.Manage_type__c = '涓綋绠$悊';
-        ast.FirstApproveDate_old__c = Date.today().addDays(-30);
-
-        Oly_TriggerHandler.bypass('AssetHandler');
-
-        insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
-        String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
-
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
-        Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = 'OCM鐩存帴璨╁2',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp,
-               Trade__c = '鍐呰部'
-        );
-        insert opp;
-        //娉ㄦ畫
-        Statu_Achievements__c Sac = new Statu_Achievements__c(
-            name = 'zhucan_one',
-            Opportunity__c = opp.id,
-            DeliveryDate__c = Date.today(),
-            ContractNO__c = 'ContractNO1',
-            ContractAmount__c = 1000
-        );
-        insert Sac;
-
-        //鏂板缓鐢靛瓙绛炬敹鍗�
-    	eSignForm__c eSignForm = new eSignForm__c();
-    	eSignForm.Statu_Achievements__c = Sac.Id;
-    	eSignForm.Name = '::娴嬭瘯鐢靛瓙绛炬敹鍗�';
-
-    	insert eSignForm;
-
-    	//鏂板缓鐢靛瓙绛炬敹鍗�7
-    	eSignFormEntry__c eSignFormEntry = new eSignFormEntry__c();
-    	eSignFormEntry.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry.entryType__c = '缁忛攢鍟嗘敹璐�';
-    	// eSignFormEntry.createdDate = Date.today().addDays(-7);
-    	insert eSignFormEntry;
-
-    	eSignFormEntry__c eSignFormEntry1 = new eSignFormEntry__c();
-    	eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry1.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry1.entryType__c = '缁忛攢鍟嗘敹璐�';
-    	// eSignFormEntry1.createdDate = Date.today().addDays(-3);
-    	insert eSignFormEntry1;
-
-    	eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
-    	eSignFormEntry2.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry2.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry2.entryType__c = '缁忛攢鍟嗘敹璐�';
-        eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
-        eSignFormEntry2.agencySignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.agencyConfirmDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPScanDayBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPSignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
-    	// eSignFormEntry2.createdDate = Date.today().addDays(-2);
-    	insert eSignFormEntry2;
-
-    	eSignFormEntry__c eSignFormEntry3 = new eSignFormEntry__c();
-    	eSignFormEntry3.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry3.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry3.entryType__c = '缁忛攢鍟嗙‘璁�';
-    	// eSignFormEntry3.createdDate = Date.today().addDays(-7);
-    	insert eSignFormEntry3;
-
-    	eSignFormEntry__c eSignFormEntry4 = new eSignFormEntry__c();
-    	eSignFormEntry4.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry4.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry4.entryType__c = '缁忛攢鍟嗙‘璁�';
-    	// eSignFormEntry4.createdDate = Date.today().addDays(-2);
-    	insert eSignFormEntry4;
-
-    	eSignFormEntry__c eSignFormEntry5 = new eSignFormEntry__c();
-    	eSignFormEntry5.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry5.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry5.entryType__c = '鍖婚櫌鏀惰揣';
-    	// eSignFormEntry5.createdDate = Date.today().addDays(-7);
-    	insert eSignFormEntry5;
-
-    	eSignFormEntry__c eSignFormEntry6 = new eSignFormEntry__c();
-    	eSignFormEntry6.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry6.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry6.entryType__c = '鍖婚櫌鏀惰揣';
-    	// eSignFormEntry6.createdDate = Date.today().addDays(-2);
-    	insert eSignFormEntry6;
-
-        eSignFormEntry__c eSignFormEntry8 = new eSignFormEntry__c();
-        eSignFormEntry8.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-        eSignFormEntry8.eSignForm__c = eSignForm.Id;
-        eSignFormEntry8.entryType__c = '鍖婚櫌纭';
-
-        insert eSignFormEntry8;
-
-        eSignFormEntry__c eSignFormEntry7 = new eSignFormEntry__c();
-        eSignFormEntry7.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-        eSignFormEntry7.eSignForm__c = eSignForm.Id;
-        eSignFormEntry7.entryType__c = '鍖婚櫌纭';
-        
-        insert eSignFormEntry7;
-
-        //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
-        eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
-        eSignFormLineItem.Name = '::鐢靛瓙绛炬敹鍗曟槑缁�';
-        eSignFormLineItem.eSignForm__c = eSignForm.Id;
-
-        insert eSignFormLineItem;
-
-        //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏ヨ〃
-        eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
-        eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
-        eSignFormLineItemEntry1.eSignFormEntry__c =eSignFormEntry2.Id;
-        eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
-
-        insert eSignFormLineItemEntry1;
-
-        eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
-        eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
-        eSignFormLineItemEntry2.eSignFormEntry__c =eSignFormEntry2.Id;
-        eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
-
-        insert eSignFormLineItemEntry2;
-
-    	list<Attachment> attachmentList = new list<Attachment>();
-        Attachment attach=new Attachment();     
-        attach.Name='Unit Test Attachment';
-        Blob bodyBlob=Blob.valueOf('Unit Test Attachment Body');
-        attach.body=bodyBlob;
-        attach.parentId=eSignFormEntry2.id;
-
-        attachmentList.add(attach);
-
-        // insert attach;
-        Attachment attach1=new Attachment();     
-        attach1.Name='Unit Test Attachment';
-        Blob bodyBlob1=Blob.valueOf('Unit Test Attachment Body');
-        attach1.body=bodyBlob1;
-        attach1.parentId=eSignForm.id;
-        
-        attachmentList.add(attach1);
-
-        insert attachmentList;
-        Test.startTest();
-        Date startDate = Date.today();
-        Date enDdate = Date.today().addDays(-1);
-        Database.executeBatch(new updateESignBatch(startDate,enDdate), 20);
-        Test.stopTest();
-    }
-
-    static testMethod void testMethod7() {
-         List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
-        if (rectCo.size() == 0) {
-            return;
-        }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
-        if (rectSct.size() == 0) {
-            return;
-        }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
-        if (rectDpt.size() == 0) {
-            return;
-        }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
-        if (rectAs.size() == 0) {
-            return;
-        }
-
-     
-        // insert hospital
-        Account company1 = new Account();
-        company1.RecordTypeId = rectCo[0].Id;
-        company1.Name = '鐥呴櫌銉嗐偣銉�1';
-        company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
-        insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
-        Account depart1 = new Account();
-        depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
-        depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
-        depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
-
-        List<Product2> prdList = new List<Product2>();
-        Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
-        prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
-        prd1.Extend_new_product_gurantee__c = true;
-        prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
-        prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
-        prdList.add(prd1);
-        insert prdList;
-    
-        Asset ast = new Asset();
-
-        ast.RecordTypeId = rectAs[0].Id;
-        ast.SerialNumber = 'abcdefg';
-        ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
-        ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
-        ast.Manage_type__c = '涓綋绠$悊';
-        ast.FirstApproveDate_old__c = Date.today().addDays(-30);
-
-        Oly_TriggerHandler.bypass('AssetHandler');
-
-        insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
-        String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
-
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
-        Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = 'OCM鐩存帴璨╁2',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp,
-               Trade__c = '鍐呰部'
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = 'OCM鐩存帴璨╁2',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp,
+            Trade__c = '鍐呰部'
         );
         insert opp;
         //娉ㄦ畫
@@ -1303,10 +930,10 @@
         eSignFormEntry2.eSignForm__c = eSignForm.Id;
         eSignFormEntry2.entryType__c = '缁忛攢鍟嗘敹璐�';
         eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
-        eSignFormEntry2.agencySignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.agencyConfirmDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPScanDayBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPSignUpDateBack__c =Date.today().addDays(-2);
+        eSignFormEntry2.agencySignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencyConfirmDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPSignUpDateBack__c = Date.today().addDays(-2);
         eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
         // eSignFormEntry2.createdDate = Date.today().addDays(-2);
         insert eSignFormEntry2;
@@ -1350,7 +977,7 @@
         eSignFormEntry7.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
         eSignFormEntry7.eSignForm__c = eSignForm.Id;
         eSignFormEntry7.entryType__c = '鍖婚櫌纭';
-        
+
         insert eSignFormEntry7;
 
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
@@ -1363,34 +990,519 @@
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏ヨ〃
         eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
-        eSignFormLineItemEntry1.eSignFormEntry__c =eSignFormEntry2.Id;
+        eSignFormLineItemEntry1.eSignFormEntry__c = eSignFormEntry2.Id;
         eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry1;
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
-        eSignFormLineItemEntry2.eSignFormEntry__c =eSignFormEntry2.Id;
+        eSignFormLineItemEntry2.eSignFormEntry__c = eSignFormEntry2.Id;
         eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry2;
 
-        list<Attachment> attachmentList = new list<Attachment>();
-        Attachment attach=new Attachment();     
-        attach.Name='Unit Test Attachment';
-        Blob bodyBlob=Blob.valueOf('Unit Test Attachment Body');
-        attach.body=bodyBlob;
-        attach.parentId=eSignFormEntry2.id;
+        list<Attachment> attachmentList = new List<Attachment>();
+        Attachment attach = new Attachment();
+        attach.Name = 'Unit Test Attachment';
+        Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+        attach.body = bodyBlob;
+        attach.parentId = eSignFormEntry2.id;
 
         attachmentList.add(attach);
 
         // insert attach;
-        Attachment attach1=new Attachment();     
-        attach1.Name='Unit Test Attachment';
-        Blob bodyBlob1=Blob.valueOf('Unit Test Attachment Body');
-        attach1.body=bodyBlob1;
-        attach1.parentId=eSignForm.id;
-        
+        Attachment attach1 = new Attachment();
+        attach1.Name = 'Unit Test Attachment';
+        Blob bodyBlob1 = Blob.valueOf('Unit Test Attachment Body');
+        attach1.body = bodyBlob1;
+        attach1.parentId = eSignForm.id;
+
+        attachmentList.add(attach1);
+
+        insert attachmentList;
+
+        Test.startTest();
+
+        Date d = Date.today();
+        Database.executeBatch(new updateESignBatch(d), 20);
+        Test.stopTest();
+    }
+
+    static testMethod void testMethod6() {
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
+        if (rectCo.size() == 0) {
+            return;
+        }
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
+        if (rectSct.size() == 0) {
+            return;
+        }
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
+        if (rectDpt.size() == 0) {
+            return;
+        }
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
+        if (rectAs.size() == 0) {
+            return;
+        }
+
+        // insert hospital
+        Account company1 = new Account();
+        company1.RecordTypeId = rectCo[0].Id;
+        company1.Name = '鐥呴櫌銉嗐偣銉�1';
+        company1.OCM_man_province_txt__c = '姹熻タ';
+        List<Account> hps = new List<Account>{ company1 };
+        insert hps;
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
+        Account depart1 = new Account();
+        depart1.RecordTypeId = rectDpt[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
+        depart1.Department_Class__c = dc1s[0].Id;
+        depart1.Hospital__c = company1.Id;
+        depart1.OCM_man_province_txt__c = '姹熻タ';
+
+        insert new List<Account>{ depart1 };
+
+        List<Product2> prdList = new List<Product2>();
+        Product2 prd1 = new Product2();
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
+        prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
+        prd1.Extend_new_product_gurantee__c = true;
+        prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
+        prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
+        prdList.add(prd1);
+        insert prdList;
+
+        Asset ast = new Asset();
+
+        ast.RecordTypeId = rectAs[0].Id;
+        ast.SerialNumber = 'abcdefg';
+        ast.Name = '娴嬭瘯璧勪骇1';
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
+        ast.Guarantee_period_for_products__c = Date.today();
+        ast.InstallDate = Date.today();
+        ast.Manage_type__c = '涓綋绠$悊';
+        ast.FirstApproveDate_old__c = Date.today().addDays(-30);
+
+        Oly_TriggerHandler.bypass('AssetHandler');
+
+        insert ast;
+
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
+        String RecordTypeID = ast1.RecordTypeID__c;
+
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
+        Opportunity opp = new Opportunity(
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = 'OCM鐩存帴璨╁2',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp,
+            Trade__c = '鍐呰部'
+        );
+        insert opp;
+        //娉ㄦ畫
+        Statu_Achievements__c Sac = new Statu_Achievements__c(
+            name = 'zhucan_one',
+            Opportunity__c = opp.id,
+            DeliveryDate__c = Date.today(),
+            ContractNO__c = 'ContractNO1',
+            ContractAmount__c = 1000
+        );
+        insert Sac;
+
+        //鏂板缓鐢靛瓙绛炬敹鍗�
+        eSignForm__c eSignForm = new eSignForm__c();
+        eSignForm.Statu_Achievements__c = Sac.Id;
+        eSignForm.Name = '::娴嬭瘯鐢靛瓙绛炬敹鍗�';
+
+        insert eSignForm;
+
+        //鏂板缓鐢靛瓙绛炬敹鍗�7
+        eSignFormEntry__c eSignFormEntry = new eSignFormEntry__c();
+        eSignFormEntry.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry.eSignForm__c = eSignForm.Id;
+        eSignFormEntry.entryType__c = '缁忛攢鍟嗘敹璐�';
+        // eSignFormEntry.createdDate = Date.today().addDays(-7);
+        insert eSignFormEntry;
+
+        eSignFormEntry__c eSignFormEntry1 = new eSignFormEntry__c();
+        eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry1.eSignForm__c = eSignForm.Id;
+        eSignFormEntry1.entryType__c = '缁忛攢鍟嗘敹璐�';
+        // eSignFormEntry1.createdDate = Date.today().addDays(-3);
+        insert eSignFormEntry1;
+
+        eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
+        eSignFormEntry2.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry2.eSignForm__c = eSignForm.Id;
+        eSignFormEntry2.entryType__c = '缁忛攢鍟嗘敹璐�';
+        eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencySignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencyConfirmDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPSignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
+        // eSignFormEntry2.createdDate = Date.today().addDays(-2);
+        insert eSignFormEntry2;
+
+        eSignFormEntry__c eSignFormEntry3 = new eSignFormEntry__c();
+        eSignFormEntry3.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry3.eSignForm__c = eSignForm.Id;
+        eSignFormEntry3.entryType__c = '缁忛攢鍟嗙‘璁�';
+        // eSignFormEntry3.createdDate = Date.today().addDays(-7);
+        insert eSignFormEntry3;
+
+        eSignFormEntry__c eSignFormEntry4 = new eSignFormEntry__c();
+        eSignFormEntry4.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry4.eSignForm__c = eSignForm.Id;
+        eSignFormEntry4.entryType__c = '缁忛攢鍟嗙‘璁�';
+        // eSignFormEntry4.createdDate = Date.today().addDays(-2);
+        insert eSignFormEntry4;
+
+        eSignFormEntry__c eSignFormEntry5 = new eSignFormEntry__c();
+        eSignFormEntry5.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry5.eSignForm__c = eSignForm.Id;
+        eSignFormEntry5.entryType__c = '鍖婚櫌鏀惰揣';
+        // eSignFormEntry5.createdDate = Date.today().addDays(-7);
+        insert eSignFormEntry5;
+
+        eSignFormEntry__c eSignFormEntry6 = new eSignFormEntry__c();
+        eSignFormEntry6.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry6.eSignForm__c = eSignForm.Id;
+        eSignFormEntry6.entryType__c = '鍖婚櫌鏀惰揣';
+        // eSignFormEntry6.createdDate = Date.today().addDays(-2);
+        insert eSignFormEntry6;
+
+        eSignFormEntry__c eSignFormEntry8 = new eSignFormEntry__c();
+        eSignFormEntry8.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry8.eSignForm__c = eSignForm.Id;
+        eSignFormEntry8.entryType__c = '鍖婚櫌纭';
+
+        insert eSignFormEntry8;
+
+        eSignFormEntry__c eSignFormEntry7 = new eSignFormEntry__c();
+        eSignFormEntry7.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry7.eSignForm__c = eSignForm.Id;
+        eSignFormEntry7.entryType__c = '鍖婚櫌纭';
+
+        insert eSignFormEntry7;
+
+        //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
+        eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
+        eSignFormLineItem.Name = '::鐢靛瓙绛炬敹鍗曟槑缁�';
+        eSignFormLineItem.eSignForm__c = eSignForm.Id;
+
+        insert eSignFormLineItem;
+
+        //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏ヨ〃
+        eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
+        eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
+        eSignFormLineItemEntry1.eSignFormEntry__c = eSignFormEntry2.Id;
+        eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
+
+        insert eSignFormLineItemEntry1;
+
+        eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
+        eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
+        eSignFormLineItemEntry2.eSignFormEntry__c = eSignFormEntry2.Id;
+        eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
+
+        insert eSignFormLineItemEntry2;
+
+        list<Attachment> attachmentList = new List<Attachment>();
+        Attachment attach = new Attachment();
+        attach.Name = 'Unit Test Attachment';
+        Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+        attach.body = bodyBlob;
+        attach.parentId = eSignFormEntry2.id;
+
+        attachmentList.add(attach);
+
+        // insert attach;
+        Attachment attach1 = new Attachment();
+        attach1.Name = 'Unit Test Attachment';
+        Blob bodyBlob1 = Blob.valueOf('Unit Test Attachment Body');
+        attach1.body = bodyBlob1;
+        attach1.parentId = eSignForm.id;
+
+        attachmentList.add(attach1);
+
+        insert attachmentList;
+        Test.startTest();
+        Date startDate = Date.today();
+        Date enDdate = Date.today().addDays(-1);
+        Database.executeBatch(new updateESignBatch(startDate, enDdate), 20);
+        Test.stopTest();
+    }
+
+    static testMethod void testMethod7() {
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
+        if (rectCo.size() == 0) {
+            return;
+        }
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
+        if (rectSct.size() == 0) {
+            return;
+        }
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
+        if (rectDpt.size() == 0) {
+            return;
+        }
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
+        if (rectAs.size() == 0) {
+            return;
+        }
+
+        // insert hospital
+        Account company1 = new Account();
+        company1.RecordTypeId = rectCo[0].Id;
+        company1.Name = '鐥呴櫌銉嗐偣銉�1';
+        company1.OCM_man_province_txt__c = '姹熻タ';
+        List<Account> hps = new List<Account>{ company1 };
+        insert hps;
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
+        Account depart1 = new Account();
+        depart1.RecordTypeId = rectDpt[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
+        depart1.Department_Class__c = dc1s[0].Id;
+        depart1.Hospital__c = company1.Id;
+        depart1.OCM_man_province_txt__c = '姹熻タ';
+
+        insert new List<Account>{ depart1 };
+
+        List<Product2> prdList = new List<Product2>();
+        Product2 prd1 = new Product2();
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
+        prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
+        prd1.Extend_new_product_gurantee__c = true;
+        prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
+        prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
+        prdList.add(prd1);
+        insert prdList;
+
+        Asset ast = new Asset();
+
+        ast.RecordTypeId = rectAs[0].Id;
+        ast.SerialNumber = 'abcdefg';
+        ast.Name = '娴嬭瘯璧勪骇1';
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
+        ast.Guarantee_period_for_products__c = Date.today();
+        ast.InstallDate = Date.today();
+        ast.Manage_type__c = '涓綋绠$悊';
+        ast.FirstApproveDate_old__c = Date.today().addDays(-30);
+
+        Oly_TriggerHandler.bypass('AssetHandler');
+
+        insert ast;
+
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
+        String RecordTypeID = ast1.RecordTypeID__c;
+
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
+        Opportunity opp = new Opportunity(
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = 'OCM鐩存帴璨╁2',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp,
+            Trade__c = '鍐呰部'
+        );
+        insert opp;
+        //娉ㄦ畫
+        Statu_Achievements__c Sac = new Statu_Achievements__c(
+            name = 'zhucan_one',
+            Opportunity__c = opp.id,
+            DeliveryDate__c = Date.today(),
+            ContractNO__c = 'ContractNO1',
+            ContractAmount__c = 1000
+        );
+        insert Sac;
+
+        //鏂板缓鐢靛瓙绛炬敹鍗�
+        eSignForm__c eSignForm = new eSignForm__c();
+        eSignForm.Statu_Achievements__c = Sac.Id;
+        eSignForm.Name = '::娴嬭瘯鐢靛瓙绛炬敹鍗�';
+
+        insert eSignForm;
+
+        //鏂板缓鐢靛瓙绛炬敹鍗�7
+        eSignFormEntry__c eSignFormEntry = new eSignFormEntry__c();
+        eSignFormEntry.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry.eSignForm__c = eSignForm.Id;
+        eSignFormEntry.entryType__c = '缁忛攢鍟嗘敹璐�';
+        // eSignFormEntry.createdDate = Date.today().addDays(-7);
+        insert eSignFormEntry;
+
+        eSignFormEntry__c eSignFormEntry1 = new eSignFormEntry__c();
+        eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry1.eSignForm__c = eSignForm.Id;
+        eSignFormEntry1.entryType__c = '缁忛攢鍟嗘敹璐�';
+        // eSignFormEntry1.createdDate = Date.today().addDays(-3);
+        insert eSignFormEntry1;
+
+        eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
+        eSignFormEntry2.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry2.eSignForm__c = eSignForm.Id;
+        eSignFormEntry2.entryType__c = '缁忛攢鍟嗘敹璐�';
+        eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencySignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencyConfirmDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPSignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
+        // eSignFormEntry2.createdDate = Date.today().addDays(-2);
+        insert eSignFormEntry2;
+
+        eSignFormEntry__c eSignFormEntry3 = new eSignFormEntry__c();
+        eSignFormEntry3.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry3.eSignForm__c = eSignForm.Id;
+        eSignFormEntry3.entryType__c = '缁忛攢鍟嗙‘璁�';
+        // eSignFormEntry3.createdDate = Date.today().addDays(-7);
+        insert eSignFormEntry3;
+
+        eSignFormEntry__c eSignFormEntry4 = new eSignFormEntry__c();
+        eSignFormEntry4.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry4.eSignForm__c = eSignForm.Id;
+        eSignFormEntry4.entryType__c = '缁忛攢鍟嗙‘璁�';
+        // eSignFormEntry4.createdDate = Date.today().addDays(-2);
+        insert eSignFormEntry4;
+
+        eSignFormEntry__c eSignFormEntry5 = new eSignFormEntry__c();
+        eSignFormEntry5.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry5.eSignForm__c = eSignForm.Id;
+        eSignFormEntry5.entryType__c = '鍖婚櫌鏀惰揣';
+        // eSignFormEntry5.createdDate = Date.today().addDays(-7);
+        insert eSignFormEntry5;
+
+        eSignFormEntry__c eSignFormEntry6 = new eSignFormEntry__c();
+        eSignFormEntry6.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry6.eSignForm__c = eSignForm.Id;
+        eSignFormEntry6.entryType__c = '鍖婚櫌鏀惰揣';
+        // eSignFormEntry6.createdDate = Date.today().addDays(-2);
+        insert eSignFormEntry6;
+
+        eSignFormEntry__c eSignFormEntry8 = new eSignFormEntry__c();
+        eSignFormEntry8.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry8.eSignForm__c = eSignForm.Id;
+        eSignFormEntry8.entryType__c = '鍖婚櫌纭';
+
+        insert eSignFormEntry8;
+
+        eSignFormEntry__c eSignFormEntry7 = new eSignFormEntry__c();
+        eSignFormEntry7.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry7.eSignForm__c = eSignForm.Id;
+        eSignFormEntry7.entryType__c = '鍖婚櫌纭';
+
+        insert eSignFormEntry7;
+
+        //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
+        eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
+        eSignFormLineItem.Name = '::鐢靛瓙绛炬敹鍗曟槑缁�';
+        eSignFormLineItem.eSignForm__c = eSignForm.Id;
+
+        insert eSignFormLineItem;
+
+        //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏ヨ〃
+        eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
+        eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
+        eSignFormLineItemEntry1.eSignFormEntry__c = eSignFormEntry2.Id;
+        eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
+
+        insert eSignFormLineItemEntry1;
+
+        eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
+        eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
+        eSignFormLineItemEntry2.eSignFormEntry__c = eSignFormEntry2.Id;
+        eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
+
+        insert eSignFormLineItemEntry2;
+
+        list<Attachment> attachmentList = new List<Attachment>();
+        Attachment attach = new Attachment();
+        attach.Name = 'Unit Test Attachment';
+        Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+        attach.body = bodyBlob;
+        attach.parentId = eSignFormEntry2.id;
+
+        attachmentList.add(attach);
+
+        // insert attach;
+        Attachment attach1 = new Attachment();
+        attach1.Name = 'Unit Test Attachment';
+        Blob bodyBlob1 = Blob.valueOf('Unit Test Attachment Body');
+        attach1.body = bodyBlob1;
+        attach1.parentId = eSignForm.id;
+
         attachmentList.add(attach1);
 
         insert attachmentList;
@@ -1404,319 +1516,110 @@
     }
 
     static testMethod void testMethod8() {
-    	 List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
         if (rectCo.size() == 0) {
             return;
         }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
         if (rectSct.size() == 0) {
             return;
         }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
         if (rectDpt.size() == 0) {
             return;
         }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
         if (rectAs.size() == 0) {
             return;
         }
 
-     
         // insert hospital
         Account company1 = new Account();
         company1.RecordTypeId = rectCo[0].Id;
         company1.Name = '鐥呴櫌銉嗐偣銉�1';
         company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
+        List<Account> hps = new List<Account>{ company1 };
         insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
         Account depart1 = new Account();
         depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
         depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
+        depart1.Hospital__c = company1.Id;
         depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
+
+        insert new List<Account>{ depart1 };
 
         List<Product2> prdList = new List<Product2>();
         Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
         prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
         prd1.Extend_new_product_gurantee__c = true;
         prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
         prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
         prdList.add(prd1);
         insert prdList;
-    
+
         Asset ast = new Asset();
 
         ast.RecordTypeId = rectAs[0].Id;
         ast.SerialNumber = 'abcdefg';
         ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
         ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
+        ast.InstallDate = Date.today();
         ast.Manage_type__c = '涓綋绠$悊';
         ast.FirstApproveDate_old__c = Date.today().addDays(-30);
 
         Oly_TriggerHandler.bypass('AssetHandler');
 
         insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
+
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
         String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
 
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
         Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = 'OCM鐩存帴璨╁2',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp,
-               Trade__c = '鍐呰部'
-        );
-        insert opp;
-        //娉ㄦ畫
-        Statu_Achievements__c Sac = new Statu_Achievements__c(
-            name = 'zhucan_one',
-            Opportunity__c = opp.id,
-            DeliveryDate__c = Date.today(),
-            ContractNO__c = 'ContractNO1',
-            ContractAmount__c = 1000
-        );
-        insert Sac;
-
-        //鏂板缓鐢靛瓙绛炬敹鍗�
-    	eSignForm__c eSignForm = new eSignForm__c();
-    	eSignForm.Statu_Achievements__c = Sac.Id;
-    	eSignForm.Name = '::娴嬭瘯鐢靛瓙绛炬敹鍗�';
-
-    	insert eSignForm;
-
-    	//鏂板缓鐢靛瓙绛炬敹鍗�7
-    	eSignFormEntry__c eSignFormEntry = new eSignFormEntry__c();
-    	eSignFormEntry.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry.entryType__c = '缁忛攢鍟嗘敹璐�';
-    	// eSignFormEntry.createdDate = Date.today().addDays(-7);
-    	insert eSignFormEntry;
-
-    	eSignFormEntry__c eSignFormEntry1 = new eSignFormEntry__c();
-    	eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry1.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry1.entryType__c = '缁忛攢鍟嗘敹璐�';
-    	// eSignFormEntry1.createdDate = Date.today().addDays(-3);
-    	insert eSignFormEntry1;
-
-    	eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
-    	eSignFormEntry2.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry2.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry2.entryType__c = '缁忛攢鍟嗘敹璐�';
-        eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
-        eSignFormEntry2.agencySignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.agencyConfirmDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPScanDayBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPSignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
-    	// eSignFormEntry2.createdDate = Date.today().addDays(-2);
-    	insert eSignFormEntry2;
-
-    	eSignFormEntry__c eSignFormEntry3 = new eSignFormEntry__c();
-    	eSignFormEntry3.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry3.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry3.entryType__c = '缁忛攢鍟嗙‘璁�';
-    	// eSignFormEntry3.createdDate = Date.today().addDays(-7);
-    	insert eSignFormEntry3;
-
-    	eSignFormEntry__c eSignFormEntry4 = new eSignFormEntry__c();
-    	eSignFormEntry4.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry4.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry4.entryType__c = '缁忛攢鍟嗙‘璁�';
-    	// eSignFormEntry4.createdDate = Date.today().addDays(-2);
-    	insert eSignFormEntry4;
-
-    	eSignFormEntry__c eSignFormEntry5 = new eSignFormEntry__c();
-    	eSignFormEntry5.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry5.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry5.entryType__c = '鍖婚櫌鏀惰揣';
-    	// eSignFormEntry5.createdDate = Date.today().addDays(-7);
-    	insert eSignFormEntry5;
-
-    	eSignFormEntry__c eSignFormEntry6 = new eSignFormEntry__c();
-    	eSignFormEntry6.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry6.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry6.entryType__c = '鍖婚櫌鏀惰揣';
-    	// eSignFormEntry6.createdDate = Date.today().addDays(-2);
-    	insert eSignFormEntry6;
-
-        eSignFormEntry__c eSignFormEntry8 = new eSignFormEntry__c();
-        eSignFormEntry8.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-        eSignFormEntry8.eSignForm__c = eSignForm.Id;
-        eSignFormEntry8.entryType__c = '鍖婚櫌纭';
-
-        insert eSignFormEntry8;
-
-        eSignFormEntry__c eSignFormEntry7 = new eSignFormEntry__c();
-        eSignFormEntry7.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-        eSignFormEntry7.eSignForm__c = eSignForm.Id;
-        eSignFormEntry7.entryType__c = '鍖婚櫌纭';
-        
-        insert eSignFormEntry7;
-
-        //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
-        eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
-        eSignFormLineItem.Name = '::鐢靛瓙绛炬敹鍗曟槑缁�';
-        eSignFormLineItem.eSignForm__c = eSignForm.Id;
-
-        insert eSignFormLineItem;
-
-        //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏ヨ〃
-        eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
-        eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
-        eSignFormLineItemEntry1.eSignFormEntry__c =eSignFormEntry2.Id;
-        eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
-
-        insert eSignFormLineItemEntry1;
-
-        eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
-        eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
-        eSignFormLineItemEntry2.eSignFormEntry__c =eSignFormEntry2.Id;
-        eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
-
-        insert eSignFormLineItemEntry2;
-
-    	list<Attachment> attachmentList = new list<Attachment>();
-        Attachment attach=new Attachment();     
-        attach.Name='Unit Test Attachment';
-        Blob bodyBlob=Blob.valueOf('Unit Test Attachment Body');
-        attach.body=bodyBlob;
-        attach.parentId=eSignFormEntry2.id;
-
-        attachmentList.add(attach);
-
-        // insert attach;
-        Attachment attach1=new Attachment();     
-        attach1.Name='Unit Test Attachment';
-        Blob bodyBlob1=Blob.valueOf('Unit Test Attachment Body');
-        attach1.body=bodyBlob1;
-        attach1.parentId=eSignForm.id;
-        
-        attachmentList.add(attach1);
-
-        insert attachmentList;
-
-        Test.startTest();
-
-        String type = '缁忛攢鍟嗘敹璐�';
-        Database.executeBatch(new updateESignBatch(type), 20);
-        Test.stopTest();
-    }
-
-    static testMethod void testMethod9() {
-    	 List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
-        if (rectCo.size() == 0) {
-            return;
-        }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
-        if (rectSct.size() == 0) {
-            return;
-        }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
-        if (rectDpt.size() == 0) {
-            return;
-        }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
-        if (rectAs.size() == 0) {
-            return;
-        }
-
-     
-        // insert hospital
-        Account company1 = new Account();
-        company1.RecordTypeId = rectCo[0].Id;
-        company1.Name = '鐥呴櫌銉嗐偣銉�1';
-        company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
-        insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
-        Account depart1 = new Account();
-        depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
-        depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
-        depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
-
-        List<Product2> prdList = new List<Product2>();
-        Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
-        prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
-        prd1.Extend_new_product_gurantee__c = true;
-        prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
-        prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
-        prdList.add(prd1);
-        insert prdList;
-    
-        Asset ast = new Asset();
-
-        ast.RecordTypeId = rectAs[0].Id;
-        ast.SerialNumber = 'abcdefg';
-        ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
-        ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
-        ast.Manage_type__c = '涓綋绠$悊';
-        ast.FirstApproveDate_old__c = Date.today().addDays(-30);
-
-        Oly_TriggerHandler.bypass('AssetHandler');
-
-        insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
-        String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
-
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
-        Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = 'OCM鐩存帴璨╁2',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp,
-               Trade__c = '鍐呰部'
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = 'OCM鐩存帴璨╁2',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp,
+            Trade__c = '鍐呰部'
         );
         insert opp;
         //娉ㄦ畫
@@ -1756,10 +1659,10 @@
         eSignFormEntry2.eSignForm__c = eSignForm.Id;
         eSignFormEntry2.entryType__c = '缁忛攢鍟嗘敹璐�';
         eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
-        eSignFormEntry2.agencySignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.agencyConfirmDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPScanDayBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPSignUpDateBack__c =Date.today().addDays(-2);
+        eSignFormEntry2.agencySignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencyConfirmDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPSignUpDateBack__c = Date.today().addDays(-2);
         eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
         // eSignFormEntry2.createdDate = Date.today().addDays(-2);
         insert eSignFormEntry2;
@@ -1803,7 +1706,7 @@
         eSignFormEntry7.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
         eSignFormEntry7.eSignForm__c = eSignForm.Id;
         eSignFormEntry7.entryType__c = '鍖婚櫌纭';
-        
+
         insert eSignFormEntry7;
 
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
@@ -1816,134 +1719,150 @@
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏ヨ〃
         eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
-        eSignFormLineItemEntry1.eSignFormEntry__c =eSignFormEntry2.Id;
+        eSignFormLineItemEntry1.eSignFormEntry__c = eSignFormEntry2.Id;
         eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry1;
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
-        eSignFormLineItemEntry2.eSignFormEntry__c =eSignFormEntry2.Id;
+        eSignFormLineItemEntry2.eSignFormEntry__c = eSignFormEntry2.Id;
         eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry2;
 
-        list<Attachment> attachmentList = new list<Attachment>();
-        Attachment attach=new Attachment();     
-        attach.Name='Unit Test Attachment';
-        Blob bodyBlob=Blob.valueOf('Unit Test Attachment Body');
-        attach.body=bodyBlob;
-        attach.parentId=eSignFormEntry2.id;
+        list<Attachment> attachmentList = new List<Attachment>();
+        Attachment attach = new Attachment();
+        attach.Name = 'Unit Test Attachment';
+        Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+        attach.body = bodyBlob;
+        attach.parentId = eSignFormEntry2.id;
 
         attachmentList.add(attach);
 
         // insert attach;
-        Attachment attach1=new Attachment();     
-        attach1.Name='Unit Test Attachment';
-        Blob bodyBlob1=Blob.valueOf('Unit Test Attachment Body');
-        attach1.body=bodyBlob1;
-        attach1.parentId=eSignForm.id;
-        
+        Attachment attach1 = new Attachment();
+        attach1.Name = 'Unit Test Attachment';
+        Blob bodyBlob1 = Blob.valueOf('Unit Test Attachment Body');
+        attach1.body = bodyBlob1;
+        attach1.parentId = eSignForm.id;
+
         attachmentList.add(attach1);
 
         insert attachmentList;
 
         Test.startTest();
 
-        List<String> ids = new List<String>();
-        ids.add(eSignForm.Id);
-        Database.executeBatch(new updateESignBatch(ids,true), 20);
+        String type = '缁忛攢鍟嗘敹璐�';
+        Database.executeBatch(new updateESignBatch(type), 20);
         Test.stopTest();
     }
 
-    static testMethod void testMethod10() {
-    	 List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+    static testMethod void testMethod9() {
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
         if (rectCo.size() == 0) {
             return;
         }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
         if (rectSct.size() == 0) {
             return;
         }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
         if (rectDpt.size() == 0) {
             return;
         }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
         if (rectAs.size() == 0) {
             return;
         }
 
-     
         // insert hospital
         Account company1 = new Account();
         company1.RecordTypeId = rectCo[0].Id;
         company1.Name = '鐥呴櫌銉嗐偣銉�1';
         company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
+        List<Account> hps = new List<Account>{ company1 };
         insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
         Account depart1 = new Account();
         depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
         depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
+        depart1.Hospital__c = company1.Id;
         depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
+
+        insert new List<Account>{ depart1 };
 
         List<Product2> prdList = new List<Product2>();
         Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
         prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
         prd1.Extend_new_product_gurantee__c = true;
         prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
         prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
         prdList.add(prd1);
         insert prdList;
-    
+
         Asset ast = new Asset();
 
         ast.RecordTypeId = rectAs[0].Id;
         ast.SerialNumber = 'abcdefg';
         ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
         ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
+        ast.InstallDate = Date.today();
         ast.Manage_type__c = '涓綋绠$悊';
         ast.FirstApproveDate_old__c = Date.today().addDays(-30);
 
         Oly_TriggerHandler.bypass('AssetHandler');
 
         insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
-        String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
 
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
+        String RecordTypeID = ast1.RecordTypeID__c;
+
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
         Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = 'OCM鐩存帴璨╁2',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp,
-               Trade__c = '鍐呰部'
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = 'OCM鐩存帴璨╁2',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp,
+            Trade__c = '鍐呰部'
         );
         insert opp;
         //娉ㄦ畫
@@ -1957,67 +1876,67 @@
         insert Sac;
 
         //鏂板缓鐢靛瓙绛炬敹鍗�
-    	eSignForm__c eSignForm = new eSignForm__c();
-    	eSignForm.Statu_Achievements__c = Sac.Id;
-    	eSignForm.Name = '::娴嬭瘯鐢靛瓙绛炬敹鍗�';
+        eSignForm__c eSignForm = new eSignForm__c();
+        eSignForm.Statu_Achievements__c = Sac.Id;
+        eSignForm.Name = '::娴嬭瘯鐢靛瓙绛炬敹鍗�';
 
-    	insert eSignForm;
+        insert eSignForm;
 
-    	//鏂板缓鐢靛瓙绛炬敹鍗�7
-    	eSignFormEntry__c eSignFormEntry = new eSignFormEntry__c();
-    	eSignFormEntry.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry.entryType__c = '缁忛攢鍟嗘敹璐�';
-    	// eSignFormEntry.createdDate = Date.today().addDays(-7);
-    	insert eSignFormEntry;
+        //鏂板缓鐢靛瓙绛炬敹鍗�7
+        eSignFormEntry__c eSignFormEntry = new eSignFormEntry__c();
+        eSignFormEntry.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry.eSignForm__c = eSignForm.Id;
+        eSignFormEntry.entryType__c = '缁忛攢鍟嗘敹璐�';
+        // eSignFormEntry.createdDate = Date.today().addDays(-7);
+        insert eSignFormEntry;
 
-    	eSignFormEntry__c eSignFormEntry1 = new eSignFormEntry__c();
-    	eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry1.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry1.entryType__c = '缁忛攢鍟嗘敹璐�';
-    	// eSignFormEntry1.createdDate = Date.today().addDays(-3);
-    	insert eSignFormEntry1;
+        eSignFormEntry__c eSignFormEntry1 = new eSignFormEntry__c();
+        eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry1.eSignForm__c = eSignForm.Id;
+        eSignFormEntry1.entryType__c = '缁忛攢鍟嗘敹璐�';
+        // eSignFormEntry1.createdDate = Date.today().addDays(-3);
+        insert eSignFormEntry1;
 
-    	eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
-    	eSignFormEntry2.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry2.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry2.entryType__c = '缁忛攢鍟嗘敹璐�';
+        eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
+        eSignFormEntry2.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry2.eSignForm__c = eSignForm.Id;
+        eSignFormEntry2.entryType__c = '缁忛攢鍟嗘敹璐�';
         eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
-        eSignFormEntry2.agencySignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.agencyConfirmDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPScanDayBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPSignUpDateBack__c =Date.today().addDays(-2);
+        eSignFormEntry2.agencySignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencyConfirmDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPSignUpDateBack__c = Date.today().addDays(-2);
         eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
-    	// eSignFormEntry2.createdDate = Date.today().addDays(-2);
-    	insert eSignFormEntry2;
+        // eSignFormEntry2.createdDate = Date.today().addDays(-2);
+        insert eSignFormEntry2;
 
-    	eSignFormEntry__c eSignFormEntry3 = new eSignFormEntry__c();
-    	eSignFormEntry3.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry3.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry3.entryType__c = '缁忛攢鍟嗙‘璁�';
-    	// eSignFormEntry3.createdDate = Date.today().addDays(-7);
-    	insert eSignFormEntry3;
+        eSignFormEntry__c eSignFormEntry3 = new eSignFormEntry__c();
+        eSignFormEntry3.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry3.eSignForm__c = eSignForm.Id;
+        eSignFormEntry3.entryType__c = '缁忛攢鍟嗙‘璁�';
+        // eSignFormEntry3.createdDate = Date.today().addDays(-7);
+        insert eSignFormEntry3;
 
-    	eSignFormEntry__c eSignFormEntry4 = new eSignFormEntry__c();
-    	eSignFormEntry4.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry4.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry4.entryType__c = '缁忛攢鍟嗙‘璁�';
-    	// eSignFormEntry4.createdDate = Date.today().addDays(-2);
-    	insert eSignFormEntry4;
+        eSignFormEntry__c eSignFormEntry4 = new eSignFormEntry__c();
+        eSignFormEntry4.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry4.eSignForm__c = eSignForm.Id;
+        eSignFormEntry4.entryType__c = '缁忛攢鍟嗙‘璁�';
+        // eSignFormEntry4.createdDate = Date.today().addDays(-2);
+        insert eSignFormEntry4;
 
-    	eSignFormEntry__c eSignFormEntry5 = new eSignFormEntry__c();
-    	eSignFormEntry5.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry5.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry5.entryType__c = '鍖婚櫌鏀惰揣';
-    	// eSignFormEntry5.createdDate = Date.today().addDays(-7);
-    	insert eSignFormEntry5;
+        eSignFormEntry__c eSignFormEntry5 = new eSignFormEntry__c();
+        eSignFormEntry5.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry5.eSignForm__c = eSignForm.Id;
+        eSignFormEntry5.entryType__c = '鍖婚櫌鏀惰揣';
+        // eSignFormEntry5.createdDate = Date.today().addDays(-7);
+        insert eSignFormEntry5;
 
-    	eSignFormEntry__c eSignFormEntry6 = new eSignFormEntry__c();
-    	eSignFormEntry6.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
-    	eSignFormEntry6.eSignForm__c = eSignForm.Id;
-    	eSignFormEntry6.entryType__c = '鍖婚櫌鏀惰揣';
-    	// eSignFormEntry6.createdDate = Date.today().addDays(-2);
-    	insert eSignFormEntry6;
+        eSignFormEntry__c eSignFormEntry6 = new eSignFormEntry__c();
+        eSignFormEntry6.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry6.eSignForm__c = eSignForm.Id;
+        eSignFormEntry6.entryType__c = '鍖婚櫌鏀惰揣';
+        // eSignFormEntry6.createdDate = Date.today().addDays(-2);
+        insert eSignFormEntry6;
 
         eSignFormEntry__c eSignFormEntry8 = new eSignFormEntry__c();
         eSignFormEntry8.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
@@ -2030,7 +1949,7 @@
         eSignFormEntry7.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
         eSignFormEntry7.eSignForm__c = eSignForm.Id;
         eSignFormEntry7.entryType__c = '鍖婚櫌纭';
-        
+
         insert eSignFormEntry7;
 
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
@@ -2043,34 +1962,278 @@
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏ヨ〃
         eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
-        eSignFormLineItemEntry1.eSignFormEntry__c =eSignFormEntry2.Id;
+        eSignFormLineItemEntry1.eSignFormEntry__c = eSignFormEntry2.Id;
         eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry1;
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
-        eSignFormLineItemEntry2.eSignFormEntry__c =eSignFormEntry2.Id;
+        eSignFormLineItemEntry2.eSignFormEntry__c = eSignFormEntry2.Id;
         eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry2;
 
-    	list<Attachment> attachmentList = new list<Attachment>();
-        Attachment attach=new Attachment();     
-        attach.Name='Unit Test Attachment';
-        Blob bodyBlob=Blob.valueOf('Unit Test Attachment Body');
-        attach.body=bodyBlob;
-        attach.parentId=eSignFormEntry2.id;
+        list<Attachment> attachmentList = new List<Attachment>();
+        Attachment attach = new Attachment();
+        attach.Name = 'Unit Test Attachment';
+        Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+        attach.body = bodyBlob;
+        attach.parentId = eSignFormEntry2.id;
 
         attachmentList.add(attach);
 
         // insert attach;
-        Attachment attach1=new Attachment();     
-        attach1.Name='Unit Test Attachment';
-        Blob bodyBlob1=Blob.valueOf('Unit Test Attachment Body');
-        attach1.body=bodyBlob1;
-        attach1.parentId=eSignForm.id;
-        
+        Attachment attach1 = new Attachment();
+        attach1.Name = 'Unit Test Attachment';
+        Blob bodyBlob1 = Blob.valueOf('Unit Test Attachment Body');
+        attach1.body = bodyBlob1;
+        attach1.parentId = eSignForm.id;
+
+        attachmentList.add(attach1);
+
+        insert attachmentList;
+
+        Test.startTest();
+
+        List<String> ids = new List<String>();
+        ids.add(eSignForm.Id);
+        Database.executeBatch(new updateESignBatch(ids, true), 20);
+        Test.stopTest();
+    }
+
+    static testMethod void testMethod10() {
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
+        if (rectCo.size() == 0) {
+            return;
+        }
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
+        if (rectSct.size() == 0) {
+            return;
+        }
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
+        if (rectDpt.size() == 0) {
+            return;
+        }
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
+        if (rectAs.size() == 0) {
+            return;
+        }
+
+        // insert hospital
+        Account company1 = new Account();
+        company1.RecordTypeId = rectCo[0].Id;
+        company1.Name = '鐥呴櫌銉嗐偣銉�1';
+        company1.OCM_man_province_txt__c = '姹熻タ';
+        List<Account> hps = new List<Account>{ company1 };
+        insert hps;
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
+        Account depart1 = new Account();
+        depart1.RecordTypeId = rectDpt[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
+        depart1.Department_Class__c = dc1s[0].Id;
+        depart1.Hospital__c = company1.Id;
+        depart1.OCM_man_province_txt__c = '姹熻タ';
+
+        insert new List<Account>{ depart1 };
+
+        List<Product2> prdList = new List<Product2>();
+        Product2 prd1 = new Product2();
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
+        prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
+        prd1.Extend_new_product_gurantee__c = true;
+        prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
+        prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
+        prdList.add(prd1);
+        insert prdList;
+
+        Asset ast = new Asset();
+
+        ast.RecordTypeId = rectAs[0].Id;
+        ast.SerialNumber = 'abcdefg';
+        ast.Name = '娴嬭瘯璧勪骇1';
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
+        ast.Guarantee_period_for_products__c = Date.today();
+        ast.InstallDate = Date.today();
+        ast.Manage_type__c = '涓綋绠$悊';
+        ast.FirstApproveDate_old__c = Date.today().addDays(-30);
+
+        Oly_TriggerHandler.bypass('AssetHandler');
+
+        insert ast;
+
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
+        String RecordTypeID = ast1.RecordTypeID__c;
+
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
+        Opportunity opp = new Opportunity(
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = 'OCM鐩存帴璨╁2',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp,
+            Trade__c = '鍐呰部'
+        );
+        insert opp;
+        //娉ㄦ畫
+        Statu_Achievements__c Sac = new Statu_Achievements__c(
+            name = 'zhucan_one',
+            Opportunity__c = opp.id,
+            DeliveryDate__c = Date.today(),
+            ContractNO__c = 'ContractNO1',
+            ContractAmount__c = 1000
+        );
+        insert Sac;
+
+        //鏂板缓鐢靛瓙绛炬敹鍗�
+        eSignForm__c eSignForm = new eSignForm__c();
+        eSignForm.Statu_Achievements__c = Sac.Id;
+        eSignForm.Name = '::娴嬭瘯鐢靛瓙绛炬敹鍗�';
+
+        insert eSignForm;
+
+        //鏂板缓鐢靛瓙绛炬敹鍗�7
+        eSignFormEntry__c eSignFormEntry = new eSignFormEntry__c();
+        eSignFormEntry.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry.eSignForm__c = eSignForm.Id;
+        eSignFormEntry.entryType__c = '缁忛攢鍟嗘敹璐�';
+        // eSignFormEntry.createdDate = Date.today().addDays(-7);
+        insert eSignFormEntry;
+
+        eSignFormEntry__c eSignFormEntry1 = new eSignFormEntry__c();
+        eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry1.eSignForm__c = eSignForm.Id;
+        eSignFormEntry1.entryType__c = '缁忛攢鍟嗘敹璐�';
+        // eSignFormEntry1.createdDate = Date.today().addDays(-3);
+        insert eSignFormEntry1;
+
+        eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
+        eSignFormEntry2.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry2.eSignForm__c = eSignForm.Id;
+        eSignFormEntry2.entryType__c = '缁忛攢鍟嗘敹璐�';
+        eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencySignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencyConfirmDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPSignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
+        // eSignFormEntry2.createdDate = Date.today().addDays(-2);
+        insert eSignFormEntry2;
+
+        eSignFormEntry__c eSignFormEntry3 = new eSignFormEntry__c();
+        eSignFormEntry3.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry3.eSignForm__c = eSignForm.Id;
+        eSignFormEntry3.entryType__c = '缁忛攢鍟嗙‘璁�';
+        // eSignFormEntry3.createdDate = Date.today().addDays(-7);
+        insert eSignFormEntry3;
+
+        eSignFormEntry__c eSignFormEntry4 = new eSignFormEntry__c();
+        eSignFormEntry4.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry4.eSignForm__c = eSignForm.Id;
+        eSignFormEntry4.entryType__c = '缁忛攢鍟嗙‘璁�';
+        // eSignFormEntry4.createdDate = Date.today().addDays(-2);
+        insert eSignFormEntry4;
+
+        eSignFormEntry__c eSignFormEntry5 = new eSignFormEntry__c();
+        eSignFormEntry5.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry5.eSignForm__c = eSignForm.Id;
+        eSignFormEntry5.entryType__c = '鍖婚櫌鏀惰揣';
+        // eSignFormEntry5.createdDate = Date.today().addDays(-7);
+        insert eSignFormEntry5;
+
+        eSignFormEntry__c eSignFormEntry6 = new eSignFormEntry__c();
+        eSignFormEntry6.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry6.eSignForm__c = eSignForm.Id;
+        eSignFormEntry6.entryType__c = '鍖婚櫌鏀惰揣';
+        // eSignFormEntry6.createdDate = Date.today().addDays(-2);
+        insert eSignFormEntry6;
+
+        eSignFormEntry__c eSignFormEntry8 = new eSignFormEntry__c();
+        eSignFormEntry8.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry8.eSignForm__c = eSignForm.Id;
+        eSignFormEntry8.entryType__c = '鍖婚櫌纭';
+
+        insert eSignFormEntry8;
+
+        eSignFormEntry__c eSignFormEntry7 = new eSignFormEntry__c();
+        eSignFormEntry7.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃';
+        eSignFormEntry7.eSignForm__c = eSignForm.Id;
+        eSignFormEntry7.entryType__c = '鍖婚櫌纭';
+
+        insert eSignFormEntry7;
+
+        //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
+        eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
+        eSignFormLineItem.Name = '::鐢靛瓙绛炬敹鍗曟槑缁�';
+        eSignFormLineItem.eSignForm__c = eSignForm.Id;
+
+        insert eSignFormLineItem;
+
+        //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏ヨ〃
+        eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
+        eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
+        eSignFormLineItemEntry1.eSignFormEntry__c = eSignFormEntry2.Id;
+        eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
+
+        insert eSignFormLineItemEntry1;
+
+        eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
+        eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
+        eSignFormLineItemEntry2.eSignFormEntry__c = eSignFormEntry2.Id;
+        eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
+
+        insert eSignFormLineItemEntry2;
+
+        list<Attachment> attachmentList = new List<Attachment>();
+        Attachment attach = new Attachment();
+        attach.Name = 'Unit Test Attachment';
+        Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+        attach.body = bodyBlob;
+        attach.parentId = eSignFormEntry2.id;
+
+        attachmentList.add(attach);
+
+        // insert attach;
+        Attachment attach1 = new Attachment();
+        attach1.Name = 'Unit Test Attachment';
+        Blob bodyBlob1 = Blob.valueOf('Unit Test Attachment Body');
+        attach1.body = bodyBlob1;
+        attach1.parentId = eSignForm.id;
+
         attachmentList.add(attach1);
 
         insert attachmentList;
@@ -2080,99 +2243,116 @@
         String type = '缁忛攢鍟嗘敹璐�';
         Date startDate = Date.today();
         Date enDdate = Date.today().addDays(-1);
-        Database.executeBatch(new updateESignBatch(type,true), 20);
+        Database.executeBatch(new updateESignBatch(type, true), 20);
         Test.stopTest();
     }
 
     //娴嬭瘯缁忛攢鍟嗘敹璐�
     static testMethod void testMethod11() {
-         List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
         if (rectCo.size() == 0) {
             return;
         }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
         if (rectSct.size() == 0) {
             return;
         }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
         if (rectDpt.size() == 0) {
             return;
         }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
         if (rectAs.size() == 0) {
             return;
         }
 
-     
         // insert hospital
         Account company1 = new Account();
         company1.RecordTypeId = rectCo[0].Id;
         company1.Name = '鐥呴櫌銉嗐偣銉�1';
         company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
+        List<Account> hps = new List<Account>{ company1 };
         insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
         Account depart1 = new Account();
         depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
         depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
+        depart1.Hospital__c = company1.Id;
         depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
+
+        insert new List<Account>{ depart1 };
 
         List<Product2> prdList = new List<Product2>();
         Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
         prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
         prd1.Extend_new_product_gurantee__c = true;
         prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
         prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
         prdList.add(prd1);
         insert prdList;
-    
+
         Asset ast = new Asset();
 
         ast.RecordTypeId = rectAs[0].Id;
         ast.SerialNumber = 'abcdefg';
         ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
         ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
+        ast.InstallDate = Date.today();
         ast.Manage_type__c = '涓綋绠$悊';
         ast.FirstApproveDate_old__c = Date.today().addDays(-30);
 
         Oly_TriggerHandler.bypass('AssetHandler');
 
         insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
-        String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
 
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
+        String RecordTypeID = ast1.RecordTypeID__c;
+
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
         Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = '璨╁2搴�',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp,
-               Trade__c = '鍐呰部'
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = '璨╁2搴�',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp,
+            Trade__c = '鍐呰部'
         );
         insert opp;
 
@@ -2197,7 +2377,7 @@
         eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃1';
         eSignFormEntry1.eSignForm__c = eSignForm.Id;
         eSignFormEntry1.entryType__c = '缁忛攢鍟嗘敹璐�';
-        
+
         insert eSignFormEntry1;
 
         eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
@@ -2206,10 +2386,10 @@
         eSignFormEntry2.entryType__c = '缁忛攢鍟嗘敹璐�';
         eSignFormEntry2.IsSubmit__c = true;
         eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
-        eSignFormEntry2.agencySignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.agencyConfirmDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPScanDayBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPSignUpDateBack__c =Date.today().addDays(-2);
+        eSignFormEntry2.agencySignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencyConfirmDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPSignUpDateBack__c = Date.today().addDays(-2);
         eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
         // eSignFormEntry2.createdDate = Date.today().addDays(-2);
         insert eSignFormEntry2;
@@ -2218,7 +2398,7 @@
         eSignFormEntry3.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃1';
         eSignFormEntry3.eSignForm__c = eSignForm.Id;
         eSignFormEntry3.entryType__c = '鍖婚櫌鏀惰揣';
-        
+
         insert eSignFormEntry3;
 
         eSignFormEntry__c eSignFormEntry4 = new eSignFormEntry__c();
@@ -2228,7 +2408,6 @@
         eSignFormEntry4.IsSubmit__c = true;
         // eSignFormEntry2.createdDate = Date.today().addDays(-2);
         insert eSignFormEntry4;
-
 
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
         eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
@@ -2241,48 +2420,48 @@
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
-        eSignFormLineItemEntry1.eSignFormEntry__c =eSignFormEntry1.Id;
+        eSignFormLineItemEntry1.eSignFormEntry__c = eSignFormEntry1.Id;
         eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry1;
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
-        eSignFormLineItemEntry2.eSignFormEntry__c =eSignFormEntry2.Id;
+        eSignFormLineItemEntry2.eSignFormEntry__c = eSignFormEntry2.Id;
         eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry2;
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry3 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry3.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�3';
-        eSignFormLineItemEntry3.eSignFormEntry__c =eSignFormEntry3.Id;
+        eSignFormLineItemEntry3.eSignFormEntry__c = eSignFormEntry3.Id;
         eSignFormLineItemEntry3.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry3;
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry4 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry4.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�4';
-        eSignFormLineItemEntry4.eSignFormEntry__c =eSignFormEntry4.Id;
+        eSignFormLineItemEntry4.eSignFormEntry__c = eSignFormEntry4.Id;
         eSignFormLineItemEntry4.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry4;
 
-        list<Attachment> attachmentList = new list<Attachment>();
-        Attachment attach=new Attachment();     
-        attach.Name='Unit Test Attachment';
-        Blob bodyBlob=Blob.valueOf('Unit Test Attachment Body');
-        attach.body=bodyBlob;
-        attach.parentId=eSignFormEntry2.id;
+        list<Attachment> attachmentList = new List<Attachment>();
+        Attachment attach = new Attachment();
+        attach.Name = 'Unit Test Attachment';
+        Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+        attach.body = bodyBlob;
+        attach.parentId = eSignFormEntry2.id;
 
         attachmentList.add(attach);
 
         // insert attach;
-        Attachment attach1=new Attachment();     
-        attach1.Name='Unit Test Attachment';
-        Blob bodyBlob1=Blob.valueOf('Unit Test Attachment Body');
-        attach1.body=bodyBlob1;
-        attach1.parentId=eSignForm.id;
-        
+        Attachment attach1 = new Attachment();
+        attach1.Name = 'Unit Test Attachment';
+        Blob bodyBlob1 = Blob.valueOf('Unit Test Attachment Body');
+        attach1.body = bodyBlob1;
+        attach1.parentId = eSignForm.id;
+
         attachmentList.add(attach1);
 
         insert attachmentList;
@@ -2294,93 +2473,110 @@
     }
     //娴嬭瘯鍖婚櫌纭
     static testMethod void testMethod12() {
-         List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
         if (rectCo.size() == 0) {
             return;
         }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
         if (rectSct.size() == 0) {
             return;
         }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
         if (rectDpt.size() == 0) {
             return;
         }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
         if (rectAs.size() == 0) {
             return;
         }
 
-     
         // insert hospital
         Account company1 = new Account();
         company1.RecordTypeId = rectCo[0].Id;
         company1.Name = '鐥呴櫌銉嗐偣銉�1';
         company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
+        List<Account> hps = new List<Account>{ company1 };
         insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
         Account depart1 = new Account();
         depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
         depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
+        depart1.Hospital__c = company1.Id;
         depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
+
+        insert new List<Account>{ depart1 };
 
         List<Product2> prdList = new List<Product2>();
         Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
         prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
         prd1.Extend_new_product_gurantee__c = true;
         prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
         prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
         prdList.add(prd1);
         insert prdList;
-    
+
         Asset ast = new Asset();
 
         ast.RecordTypeId = rectAs[0].Id;
         ast.SerialNumber = 'abcdefg';
         ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
         ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
+        ast.InstallDate = Date.today();
         ast.Manage_type__c = '涓綋绠$悊';
         ast.FirstApproveDate_old__c = Date.today().addDays(-30);
 
         Oly_TriggerHandler.bypass('AssetHandler');
 
         insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
-        String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
 
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
+        String RecordTypeID = ast1.RecordTypeID__c;
+
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
         Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = '璨╁2搴�',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp,
-               Trade__c = '鍐呰部'
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = '璨╁2搴�',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp,
+            Trade__c = '鍐呰部'
         );
         insert opp;
 
@@ -2405,7 +2601,7 @@
         eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃1';
         eSignFormEntry1.eSignForm__c = eSignForm.Id;
         eSignFormEntry1.entryType__c = '鍖婚櫌纭';
-        
+
         insert eSignFormEntry1;
 
         eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
@@ -2422,7 +2618,6 @@
         // eSignFormEntry2.createdDate = Date.today().addDays(-2);
         insert eSignFormEntry2;
 
-
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
         eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
         eSignFormLineItem.Name = '::鐢靛瓙绛炬敹鍗曟槑缁�';
@@ -2434,34 +2629,34 @@
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
-        eSignFormLineItemEntry1.eSignFormEntry__c =eSignFormEntry1.Id;
+        eSignFormLineItemEntry1.eSignFormEntry__c = eSignFormEntry1.Id;
         eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry1;
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
-        eSignFormLineItemEntry2.eSignFormEntry__c =eSignFormEntry2.Id;
+        eSignFormLineItemEntry2.eSignFormEntry__c = eSignFormEntry2.Id;
         eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry2;
 
-        list<Attachment> attachmentList = new list<Attachment>();
-        Attachment attach=new Attachment();     
-        attach.Name='Unit Test Attachment';
-        Blob bodyBlob=Blob.valueOf('Unit Test Attachment Body');
-        attach.body=bodyBlob;
-        attach.parentId=eSignFormEntry2.id;
+        list<Attachment> attachmentList = new List<Attachment>();
+        Attachment attach = new Attachment();
+        attach.Name = 'Unit Test Attachment';
+        Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+        attach.body = bodyBlob;
+        attach.parentId = eSignFormEntry2.id;
 
         attachmentList.add(attach);
 
         // insert attach;
-        Attachment attach1=new Attachment();     
-        attach1.Name='Unit Test Attachment';
-        Blob bodyBlob1=Blob.valueOf('Unit Test Attachment Body');
-        attach1.body=bodyBlob1;
-        attach1.parentId=eSignForm.id;
-        
+        Attachment attach1 = new Attachment();
+        attach1.Name = 'Unit Test Attachment';
+        Blob bodyBlob1 = Blob.valueOf('Unit Test Attachment Body');
+        attach1.body = bodyBlob1;
+        attach1.parentId = eSignForm.id;
+
         attachmentList.add(attach1);
 
         insert attachmentList;
@@ -2472,95 +2667,112 @@
         Test.stopTest();
     }
 
-        //娴嬭瘯缁忛攢鍟嗘敹璐�
+    //娴嬭瘯缁忛攢鍟嗘敹璐�
     static testMethod void testMethod13() {
-         List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
         if (rectCo.size() == 0) {
             return;
         }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
         if (rectSct.size() == 0) {
             return;
         }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
         if (rectDpt.size() == 0) {
             return;
         }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
         if (rectAs.size() == 0) {
             return;
         }
 
-     
         // insert hospital
         Account company1 = new Account();
         company1.RecordTypeId = rectCo[0].Id;
         company1.Name = '鐥呴櫌銉嗐偣銉�1';
         company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
+        List<Account> hps = new List<Account>{ company1 };
         insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
         Account depart1 = new Account();
         depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
         depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
+        depart1.Hospital__c = company1.Id;
         depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
+
+        insert new List<Account>{ depart1 };
 
         List<Product2> prdList = new List<Product2>();
         Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
         prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
         prd1.Extend_new_product_gurantee__c = true;
         prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
         prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
         prdList.add(prd1);
         insert prdList;
-    
+
         Asset ast = new Asset();
 
         ast.RecordTypeId = rectAs[0].Id;
         ast.SerialNumber = 'abcdefg';
         ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
         ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
+        ast.InstallDate = Date.today();
         ast.Manage_type__c = '涓綋绠$悊';
         ast.FirstApproveDate_old__c = Date.today().addDays(-30);
 
         Oly_TriggerHandler.bypass('AssetHandler');
 
         insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
-        String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
 
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
+        String RecordTypeID = ast1.RecordTypeID__c;
+
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
         Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = '璨╁2搴�',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp,
-               Trade__c = '鍐呰部'
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = '璨╁2搴�',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp,
+            Trade__c = '鍐呰部'
         );
         insert opp;
 
@@ -2581,14 +2793,12 @@
         eSignForm.RC_Manager__c = UserInfo.getUserId();
         // eSignForm.RC_Manager2__c = UserInfo.getUserId();
         // eSignForm.RC_Manager3__c = UserInfo.getUserId();
-        eSignForm.agencyRejectDate__c   = Date.today().addDays(2);
-        eSignForm.HPRejectDate__c   = Date.today().addDays(2);
-
-
+        eSignForm.agencyRejectDate__c = Date.today().addDays(2);
+        eSignForm.HPRejectDate__c = Date.today().addDays(2);
 
         insert eSignForm;
 
-/*        eSignFormEntry__c eSignFormEntry1 = new eSignFormEntry__c();
+        /*        eSignFormEntry__c eSignFormEntry1 = new eSignFormEntry__c();
         eSignFormEntry1.Name = '::鐢靛瓙绛炬敹鍗曞綍鍏ヨ〃1';
         eSignFormEntry1.eSignForm__c = eSignForm.Id;
         eSignFormEntry1.entryType__c = '缁忛攢鍟嗘敹璐�';
@@ -2609,12 +2819,10 @@
         // eSignFormEntry2.createdDate = Date.today().addDays(-2);
         insert eSignFormEntry2;*/
 
-
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
         eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
         eSignFormLineItem.Name = '::鐢靛瓙绛炬敹鍗曟槑缁�';
         eSignFormLineItem.eSignForm__c = eSignForm.Id;
-
 
         insert eSignFormLineItem;
 
@@ -2634,126 +2842,140 @@
 
         insert eSignFormLineItemEntry2;*/
 
-        list<Attachment> attachmentList = new list<Attachment>();
-        Attachment attach=new Attachment();     
-        attach.Name='Unit Test Attachment';
-        Blob bodyBlob=Blob.valueOf('Unit Test Attachment Body');
-        attach.body=bodyBlob;
-        attach.parentId=eSignForm.id;
+        list<Attachment> attachmentList = new List<Attachment>();
+        Attachment attach = new Attachment();
+        attach.Name = 'Unit Test Attachment';
+        Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+        attach.body = bodyBlob;
+        attach.parentId = eSignForm.id;
         attach.ContentType = 'application/pdf';
 
         attachmentList.add(attach);
 
         // insert attach;
-        Attachment attach1=new Attachment();     
-        attach1.Name='Unit Test Attachment';
-        Blob bodyBlob1=Blob.valueOf('Unit Test Attachment Body');
-        attach1.body=bodyBlob1;
-        attach1.parentId=eSignForm.id;
+        Attachment attach1 = new Attachment();
+        attach1.Name = 'Unit Test Attachment';
+        Blob bodyBlob1 = Blob.valueOf('Unit Test Attachment Body');
+        attach1.body = bodyBlob1;
+        attach1.parentId = eSignForm.id;
         attach1.ContentType = 'application/pdf';
-        
+
         attachmentList.add(attach1);
 
         insert attachmentList;
 
         Test.startTest();
 
-
         Database.executeBatch(new updateESignBatch(), 20);
         Test.stopTest();
-    
     }
-     //璺戝崟鐙柟娉�
+    //璺戝崟鐙柟娉�
     @isTest
     private static void test_upsertESignLineItems() {
-
-         List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
         if (rectCo.size() == 0) {
             return;
         }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
         if (rectSct.size() == 0) {
             return;
         }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
         if (rectDpt.size() == 0) {
             return;
         }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
         if (rectAs.size() == 0) {
             return;
         }
 
-     
         // insert hospital
         Account company1 = new Account();
         company1.RecordTypeId = rectCo[0].Id;
         company1.Name = '鐥呴櫌銉嗐偣銉�1';
         company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
+        List<Account> hps = new List<Account>{ company1 };
         insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
         Account depart1 = new Account();
         depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
         depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
+        depart1.Hospital__c = company1.Id;
         depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
+
+        insert new List<Account>{ depart1 };
 
         List<Product2> prdList = new List<Product2>();
         Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
         prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
         prd1.Extend_new_product_gurantee__c = true;
         prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
         prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
         prdList.add(prd1);
         insert prdList;
-    
+
         Asset ast = new Asset();
 
         ast.RecordTypeId = rectAs[0].Id;
         ast.SerialNumber = 'abcdefg';
         ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
         ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
+        ast.InstallDate = Date.today();
         ast.Manage_type__c = '涓綋绠$悊';
         ast.FirstApproveDate_old__c = Date.today().addDays(-30);
 
         Oly_TriggerHandler.bypass('AssetHandler');
 
         insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
-        String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
 
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
+        String RecordTypeID = ast1.RecordTypeID__c;
+
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
         Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = '璨╁2搴�',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp,
-               Trade__c = '鍐呰部'
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = '璨╁2搴�',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp,
+            Trade__c = '鍐呰部'
         );
         insert opp;
 
@@ -2767,16 +2989,12 @@
         );
         insert Sac;
 
-
         //鏂板缓鐢靛瓙绛炬敹鍗�
         eSignForm__c eSignForm = new eSignForm__c();
         eSignForm.Statu_Achievements__c = Sac.Id;
         eSignForm.Name = '::娴嬭瘯鐢靛瓙绛炬敹鍗�';
-        
 
         insert eSignForm;
-
-        
 
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
         eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
@@ -2784,8 +3002,6 @@
         eSignFormLineItem.eSignForm__c = eSignForm.Id;
 
         insert eSignFormLineItem;
-
-        
 
         /*list<Attachment> attachmentList = new list<Attachment>();
         Attachment attach=new Attachment();     
@@ -2893,7 +3109,6 @@
 
         // }
 
-
         OCM_Management_Province__c mp1 = new OCM_Management_Province__c();
         mp1.Name = '姹熻タ';
         mp1.GI_assistant__c = UserInfo.getUserId();
@@ -2903,109 +3118,125 @@
 
         insert mp1;
 
-        List <String> provinceList = new List<String>{'姹熻タ'};
-        Map < Id, String > provinceMap = new Map < Id, String >();
+        List<String> provinceList = new List<String>{ '姹熻タ' };
+        Map<Id, String> provinceMap = new Map<Id, String>();
         Id i = eSignForm.id;
         // provinceMap.put(i,'鍖椾含甯�');
         // provinceMap.put(i,'灞辫タ鐪�');
-        provinceMap.put(i,'姹熻タ');
+        provinceMap.put(i, '姹熻タ');
 
-        List < eSignForm__c > eSignFormList = new List < eSignForm__c >();
+        List<eSignForm__c> eSignFormList = new List<eSignForm__c>();
         eSignFormList.add(eSignForm);
 
-        updateESignBatch.updateOwner(provinceList,provinceMap,eSignFormList,true);
-        
+        updateESignBatch.updateOwner(provinceList, provinceMap, eSignFormList, true);
     }
 
-        //娴嬭瘯缁忛攢鍟嗘敹璐�
+    //娴嬭瘯缁忛攢鍟嗘敹璐�
     static testMethod void testMethod14() {
-         List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+        List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
         if (rectCo.size() == 0) {
             return;
         }
-        List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
+        List<RecordType> rectSct = [
+            SELECT Id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'
+        ];
         if (rectSct.size() == 0) {
             return;
         }
-        List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
+        List<RecordType> rectDpt = [
+            SELECT Id, Name
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�')
+            ORDER BY Name DESC
+        ];
         if (rectDpt.size() == 0) {
             return;
         }
-         List<RecordType> rectAs = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Asset' and Name = '澶囧搧'];
+        List<RecordType> rectAs = [SELECT Id, Name FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Asset' AND Name = '澶囧搧'];
         if (rectAs.size() == 0) {
             return;
         }
 
-     
         // insert hospital
         Account company1 = new Account();
         company1.RecordTypeId = rectCo[0].Id;
         company1.Name = '鐥呴櫌銉嗐偣銉�1';
         company1.OCM_man_province_txt__c = '姹熻タ';
-        List<Account> hps = new Account[]{company1};
+        List<Account> hps = new List<Account>{ company1 };
         insert hps;
-          
-        List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = :company1.Id order by Department_Class_Label__c];
-        
+
+        List<Account> dc1s = [
+            SELECT Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c
+            FROM Account
+            WHERE Parent.Id = :company1.Id
+            ORDER BY Department_Class_Label__c
+        ];
+
         Account depart1 = new Account();
         depart1.RecordTypeId = rectDpt[0].Id;
-        depart1.Name         = '*';
-        depart1.Department_Name__c  = '瑷虹檪绉�1';
-        depart1.ParentId            = dc1s[0].Id;
+        depart1.Name = '*';
+        depart1.Department_Name__c = '瑷虹檪绉�1';
+        depart1.ParentId = dc1s[0].Id;
         depart1.Department_Class__c = dc1s[0].Id;
-        depart1.Hospital__c         = company1.Id;
+        depart1.Hospital__c = company1.Id;
         depart1.OCM_man_province_txt__c = '姹熻タ';
-        
-        insert new Account[] {depart1};
+
+        insert new List<Account>{ depart1 };
 
         List<Product2> prdList = new List<Product2>();
         Product2 prd1 = new Product2();
-        prd1.ProductCode_Ext__c     = 'HistoryPrd1';
-        prd1.ProductCode            = 'HistoryPrd1';
+        prd1.ProductCode_Ext__c = 'HistoryPrd1';
+        prd1.ProductCode = 'HistoryPrd1';
         prd1.Repair_Product_Code__c = 'HistoryPrd1_RP';
-        prd1.Name                   = 'HistoryPrd1';
-        prd1.Manual_Entry__c        = false;
+        prd1.Name = 'HistoryPrd1';
+        prd1.Manual_Entry__c = false;
         prd1.Extend_new_product_gurantee__c = true;
         prd1.Extend_Gurantee_Start__c = Date.today().addDays(-60);
         prd1.Extend_Gurantee_End__c = Date.today().addDays(60);
         prdList.add(prd1);
         insert prdList;
-    
+
         Asset ast = new Asset();
 
         ast.RecordTypeId = rectAs[0].Id;
         ast.SerialNumber = 'abcdefg';
         ast.Name = '娴嬭瘯璧勪骇1';
-        ast.AccountId              = depart1.Id;
-        ast.Department_Class__c    = dc1s[0].Id;
-        ast.Hospital__c            = company1.Id;
-        ast.Product2Id             = prd1.Id;
+        ast.AccountId = depart1.Id;
+        ast.Department_Class__c = dc1s[0].Id;
+        ast.Hospital__c = company1.Id;
+        ast.Product2Id = prd1.Id;
         ast.Guarantee_period_for_products__c = Date.today();
-        ast.InstallDate                      = Date.today();
+        ast.InstallDate = Date.today();
         ast.Manage_type__c = '涓綋绠$悊';
         ast.FirstApproveDate_old__c = Date.today().addDays(-30);
 
         Oly_TriggerHandler.bypass('AssetHandler');
 
         insert ast;
-        
-        Asset ast1 = [select RecordTypeID__c from Asset where Id =: ast.Id];
-        
-        String RecordTypeID = ast1.RecordTypeID__c;
-           
-        System.assertEquals(RecordTypeID , ast.RecordTypeId);
 
-        RecordType rectOpp = [select id from RecordType where IsActive = true and SobjectType = 'Opportunity' and DeveloperName = 'Opportunity' ];
+        Asset ast1 = [SELECT RecordTypeID__c FROM Asset WHERE Id = :ast.Id];
+
+        String RecordTypeID = ast1.RecordTypeID__c;
+
+        System.assertEquals(RecordTypeID, ast.RecordTypeId);
+
+        RecordType rectOpp = [
+            SELECT id
+            FROM RecordType
+            WHERE IsActive = TRUE AND SobjectType = 'Opportunity' AND DeveloperName = 'Opportunity'
+        ];
         Opportunity opp = new Opportunity(
-               Name='testOpp1',
-               StageName='寮曞悎',
-               CloseDate=Date.today(),
-               AccountId=depart1.Id,
-               Sales_Root__c = '璨╁2搴�',
-               Competitor__c ='A',
-               Click_Close_Date__c = null,
-               RecordType = rectOpp,
-               Trade__c = '鍐呰部'
+            Name = 'testOpp1',
+            StageName = '寮曞悎',
+            CloseDate = Date.today(),
+            AccountId = depart1.Id,
+            Sales_Root__c = '璨╁2搴�',
+            Competitor__c = 'A',
+            Click_Close_Date__c = null,
+            RecordType = rectOpp,
+            Trade__c = '鍐呰部'
         );
         insert opp;
 
@@ -3023,9 +3254,8 @@
         eSignForm__c eSignForm = new eSignForm__c();
         eSignForm.Statu_Achievements__c = Sac.Id;
         eSignForm.Name = '::娴嬭瘯鐢靛瓙绛炬敹鍗�';
-        eSignForm.agencyRejectDate__c   = Date.today().addDays(2);
-        eSignForm.HPRejectDate__c   = Date.today().addDays(2);
-
+        eSignForm.agencyRejectDate__c = Date.today().addDays(2);
+        eSignForm.HPRejectDate__c = Date.today().addDays(2);
 
         insert eSignForm;
 
@@ -3034,7 +3264,6 @@
         eSignFormEntry1.eSignForm__c = eSignForm.Id;
         eSignFormEntry1.entryType__c = '缁忛攢鍟嗘敹璐�';
 
-        
         insert eSignFormEntry1;
 
         eSignFormEntry__c eSignFormEntry2 = new eSignFormEntry__c();
@@ -3043,14 +3272,13 @@
         eSignFormEntry2.entryType__c = '缁忛攢鍟嗘敹璐�';
         eSignFormEntry2.IsSubmit__c = true;
         eSignFormEntry2.agencyScanDayBack__c = Date.today().addDays(-2);
-        eSignFormEntry2.agencySignUpDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.agencyConfirmDateBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPScanDayBack__c =Date.today().addDays(-2);
-        eSignFormEntry2.HPSignUpDateBack__c =Date.today().addDays(-2);
+        eSignFormEntry2.agencySignUpDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.agencyConfirmDateBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPScanDayBack__c = Date.today().addDays(-2);
+        eSignFormEntry2.HPSignUpDateBack__c = Date.today().addDays(-2);
         eSignFormEntry2.HPConfirmDateBack__c = Date.today().addDays(-2);
         // eSignFormEntry2.createdDate = Date.today().addDays(-2);
         insert eSignFormEntry2;
-
 
         //鏂板缓鐢靛瓙绛炬敹鍗曟槑缁�
         eSignFormLineItem__c eSignFormLineItem = new eSignFormLineItem__c();
@@ -3063,55 +3291,52 @@
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry1 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry1.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�1';
-        eSignFormLineItemEntry1.eSignFormEntry__c =eSignFormEntry1.Id;
+        eSignFormLineItemEntry1.eSignFormEntry__c = eSignFormEntry1.Id;
         eSignFormLineItemEntry1.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry1;
 
         eSignFormLineItemEntry__c eSignFormLineItemEntry2 = new eSignFormLineItemEntry__c();
         eSignFormLineItemEntry2.Name = '::鐢靛瓙绛炬敹鍗曟槑缁嗗綍鍏�2';
-        eSignFormLineItemEntry2.eSignFormEntry__c =eSignFormEntry2.Id;
+        eSignFormLineItemEntry2.eSignFormEntry__c = eSignFormEntry2.Id;
         eSignFormLineItemEntry2.eSignFormLineItem__c = eSignFormLineItem.Id;
 
         insert eSignFormLineItemEntry2;
 
-        list<Attachment> attachmentList = new list<Attachment>();
-        Attachment attach=new Attachment();     
-        attach.Name='Unit Test Attachment';
-        Blob bodyBlob=Blob.valueOf('Unit Test Attachment Body');
-        attach.body=bodyBlob;
-        attach.parentId=eSignFormEntry2.id;
+        list<Attachment> attachmentList = new List<Attachment>();
+        Attachment attach = new Attachment();
+        attach.Name = 'Unit Test Attachment';
+        Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+        attach.body = bodyBlob;
+        attach.parentId = eSignFormEntry2.id;
         attach.ContentType = 'application/pdf';
 
         attachmentList.add(attach);
 
         // insert attach;
-        Attachment attach1=new Attachment();     
-        attach1.Name='H-65224941-20200923--10.jpg';
-        Blob bodyBlob1=Blob.valueOf('Unit Test Attachment Body');
-        attach1.body=bodyBlob1;
-        attach1.parentId=eSignForm.id;
+        Attachment attach1 = new Attachment();
+        attach1.Name = 'H-65224941-20200923--10.jpg';
+        Blob bodyBlob1 = Blob.valueOf('Unit Test Attachment Body');
+        attach1.body = bodyBlob1;
+        attach1.parentId = eSignForm.id;
         attach1.ContentType = 'application/pdf';
-        
-        
+
         attachmentList.add(attach1);
 
-        Attachment attach2=new Attachment();     
-        attach2.Name='A-65224945-20200928--8.jpg';
-        Blob bodyBlob2=Blob.valueOf('Unit Test Attachment Body');
-        attach2.body=bodyBlob2;
-        attach2.parentId=eSignForm.id;
+        Attachment attach2 = new Attachment();
+        attach2.Name = 'A-65224945-20200928--8.jpg';
+        Blob bodyBlob2 = Blob.valueOf('Unit Test Attachment Body');
+        attach2.body = bodyBlob2;
+        attach2.parentId = eSignForm.id;
         attach2.ContentType = 'application/pdf';
-        
-        
+
         attachmentList.add(attach2);
 
         insert attachmentList;
 
         Test.startTest();
 
-
         Database.executeBatch(new updateESignBatch(), 20);
         Test.stopTest();
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1