From 9fea9c7f6c14fe5500c70c63b4da3336631bc1d4 Mon Sep 17 00:00:00 2001
From: 涂煌豪 <tuhuanghao@prec-tech.com>
Date: 星期六, 02 四月 2022 17:07:13 +0800
Subject: [PATCH] 产品咨询单提醒上线
---
force-app/main/default/classes/taskAlertController.cls | 6
force-app/main/default/classes/taskAlertControllerTest.cls | 9
force-app/main/default/classes/LeadIntentionController.cls | 1490 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
force-app/main/default/pages/taskAlert.page | 14
force-app/main/default/classes/LeadIntentionControllerTest.cls | 59 +
5 files changed, 1,529 insertions(+), 49 deletions(-)
diff --git a/force-app/main/default/classes/LeadIntentionController.cls b/force-app/main/default/classes/LeadIntentionController.cls
index 38386d8..c21db34 100644
--- a/force-app/main/default/classes/LeadIntentionController.cls
+++ b/force-app/main/default/classes/LeadIntentionController.cls
@@ -1,5 +1,5 @@
-public with sharing class LeadIntentionController {
- public List<PCLInfo> pclInfos { get; set; }
+public without sharing class LeadIntentionController {
+ public List<PCLInfo> pclInfos { get; set; }
/*****************妞滅储鐢�******************/
@@ -64,7 +64,7 @@
public String[] sortOrder { get; set; }
public String[] columus = new String[]{'Contact_Name__c', 'Hospital_Name__c', 'Department_Class__c', 'Company__c', 'Status__c'
,'Request1__c', 'Inquiry_No__c', 'Phone__c', 'Email__c', 'Cancel_Reason__c'
- ,'Opp_Name_Search__c', 'Opportunity_Division__c', 'LeadSource__c', 'Campaign__c'
+ ,'Opp_Name_Search__c', 'Opportunity_Division__c', 'LeadSource__c', 'Campaign__c'
,'Urgent__c', 'Request_Detail__c','Contact_Id__c','Hospital_ID__c','Department_ID__c','Opp_Name_Search_ID__c'
,'Campaign_ID__c','Id','Name','Family_Name__c','Last_Name__c','Reasons_options__c','Product1__c'
};
@@ -72,6 +72,8 @@
private String soqlForMoneyWithoutSort = null;
private static Integer searchLimit = 1000;
+ public String staticResource {get; set;}
+ public String awsDataIds {get; set;}
public LeadIntentionController() {
pclInfos = new List<PCLInfo>();
@@ -130,9 +132,11 @@
reasons = '鍘熷洜閫夐」';
- leadStatus = '鏈窡杩�';
+ leadStatus = '01.鏈窡杩�';
isActiveFormula = '鏈夋晥';
+
+ staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Inquiry_form__c'));
}
@@ -153,11 +157,11 @@
}
soqlWithoutSort = this.makeSoql(false, accSearch, ownerSearch,
text, condition, value, text2, condition2, value2, text3, condition3, value3);
- String soql = soqlWithoutSort + ' order by CreatedDate desc limit ' + Integer.valueOf(limits);
+ String soql = soqlWithoutSort + ' order by CreatedDate desc limit ' + Integer.valueOf(limits);
soqlForMoneyWithoutSort = this.makeSoql(true, accSearch, ownerSearch,
text, condition, value, text2, condition2, value2, text3, condition3, value3);
- String soqlForMoney = soqlForMoneyWithoutSort + ' order by CreatedDate desc limit ' + Integer.valueOf(System.Label.TotalLimit);
+ String soqlForMoney = soqlForMoneyWithoutSort + ' order by CreatedDate desc limit ' + Integer.valueOf(System.Label.TotalLimit);
System.debug('soqlWithoutSort:' + soqlWithoutSort);
system.debug('aaaaaaaaaa'+soql);
system.debug('bbbbbbb:'+soqlForMoney);
@@ -165,6 +169,14 @@
List<Inquiry_form__c> queryListForMoney = Database.query(soqlForMoney);
system.debug('ppppppppp:'+queryList);
system.debug('ooooooooo:'+queryListForMoney);
+ system.debug('ppppppppp鐨剆ize():'+queryList.size());
+ system.debug('ooooooooo鐨剆ize():'+queryListForMoney.size());
+
+ BatchIF_Log__c iflog = new BatchIF_Log__c();
+ iflog.Type__c = 'TestTaskManage';
+
+ iflog.Log__c = '杩涘叆浜唅nit鏂规硶: queryListForMoney sql: '+soqlWithoutSort;
+ insert iflog;
this.makeOppRecordsForView(queryList, queryListForMoney);
this.sortKey = '0';
@@ -173,9 +185,16 @@
this.sortOrder = new String[columus.size()];
for (Integer i = 0; i < columus.size(); i++) this.sortOrder[i] = '銆�';
+ System.debug('鏈�鍚庡彇寰�:'+pclInfos.size());
pclCount = pclInfos.size();
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '鍙栧緱鏈�杩戠殑 ' + pclCount + ' 鏉℃暟鎹�'));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '鍙栧緱鏈�杩戠殑 ' + pclCount + ' 鏉℃暟鎹�'));
+
+ List<String> a = new List<String>();
+ for(Inquiry_form__c ifc : queryList){
+ a.add(ifc.AWS_Data_Id__c);
+ }
+ awsDataIds = JSON.serialize(a);
return null;
}
@@ -247,7 +266,7 @@
List<Inquiry_form__c> updateInquiryform = new List<Inquiry_form__c>();
Inquiry_form__c inquiryForm = new Inquiry_form__c();
inquiryForm.Id = inquiryformId;
- inquiryForm.Status__c = '涓嶉渶瑕�';
+ inquiryForm.Status__c = '02.涓嶉渶瑕�';
//涓嶉渶瑕佺殑鏃跺�� 鐨勭‘璁ゆ棩鏈�
system.debug('ccccccc:'+opp_ID);
inquiryForm.Confirmation_Date__c = Date.toDay();
@@ -285,7 +304,7 @@
system.debug('杈撳嚭鐨勫�间负锛�'+oi.reasonFlg);
if (oi.reasonFlg == '1') {
oi.reasonFlg = '0';
- oi.rec.Status__c = '涓嶉渶瑕�';
+ oi.rec.Status__c = '02.涓嶉渶瑕�';
oi.rec.Reasons_options__c=batchReason;
oi.rec.Cancel_Reason__c = batchReason;
oi.rec.Confirmation_Date__c = Date.toDay();
@@ -352,9 +371,13 @@
+ ' Opp_Name_Search__c, Opportunity_Division__c, LeadSource__c, Campaign__c,'
+ ' Urgent__c, Request_Detail__c ,Contact_Id__c,Hospital_ID__c,Department_ID__c,Opp_Name_Search_ID__c,'
+ 'Campaign_ID__c,Last_Name__c,Family_Name__c,Name,Reasons_options__c,'
- + 'Product1__c,Confirmation_Date__c'
+ + 'Product1__c,Confirmation_Date__c,AWS_Data_Id__c'
//,Lead_link__c
+ ' from Inquiry_form__c where Id != null ';
+ //2021-11-24 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 start
+ //鍙煡璇㈡墍鏈変汉鏄綋鍓嶇敤鎴风殑浜у搧鍜ㄨ鍗�
+ //+ ' And OwnerId = \''+UserInfo.getUserId()+'\''
+ //2021-11-24 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 end
//鐘舵�佸彧鏄剧ず鏈窡杩�
if (!String.isBlank(leadStatus)) {
@@ -394,7 +417,7 @@
Savepoint sp = Database.setSavepoint();
Database.SaveResult[] results = Database.update(queryList, false);
Database.rollback(sp);
- system.debug('llllllllll:'+queryListForMoney);
+ system.debug('llllllllll:'+queryListForMoney.size());
for (Integer i = 0; i < queryListForMoney.size(); i++) {
system.debug('vvvvvvvvvv:'+queryList);
if(i<queryList.size()){
@@ -533,5 +556,1448 @@
}
}
-
+
+ public static void forTest(){
+ integer i = 0;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LeadIntentionControllerTest.cls b/force-app/main/default/classes/LeadIntentionControllerTest.cls
index fb8773c..54c5a02 100644
--- a/force-app/main/default/classes/LeadIntentionControllerTest.cls
+++ b/force-app/main/default/classes/LeadIntentionControllerTest.cls
@@ -1,8 +1,15 @@
@isTest
private class LeadIntentionControllerTest {
+
+ @testSetup
+ static void setUp(){
+ TestDataUtility.CreatePIPolicyConfigurations( new string[]{'Inquiry_form__c'});
+ }
+
static testMethod void testMethod1() {
- //鍖婚櫌
- List<RecordType> rectHp = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and DeveloperName = 'HP'];
+ LeadIntentionController.forTest();
+ //鍖婚櫌
+ List<RecordType> rectHp = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and DeveloperName = 'HP'];
if (rectHp.size() == 0) {
return;
}
@@ -13,16 +20,16 @@
}
- Profile p = [select Id from Profile where id =:System.Label.ProfileId_SystemAdmin];
+ Profile p = [select Id from Profile where id =:System.Label.ProfileId_SystemAdmin];
- User hpOwner = new User(Test_staff__c = true, LastName = 'hp', FirstName = 'owner', Alias = 'hp', Work_Location__c = '鍖椾含', CommunityNickname = 'hpOwner', Email = 'olympus_hpowner@sunbridge.com', Username = 'olympus_hpowner@sunbridge.com', IsActive = true, EmailEncodingKey = 'ISO-2022-JP', TimeZoneSidKey = 'Asia/Tokyo', LocaleSidKey = 'ja_JP', LanguageLocaleKey = 'ja', ProfileId = p.id);
- insert hpOwner;
- User hpOwner2 = new User(Test_staff__c = true, LastName = 'hp2', FirstName = 'owner', Alias = 'hp2', Work_Location__c = '閲嶅簡', CommunityNickname = 'hpOwner2', Email = 'olympus_hpowner@sunbridge.com', Username = 'olympus_hpowner2@sunbridge.com', IsActive = true, EmailEncodingKey = 'ISO-2022-JP', TimeZoneSidKey = 'Asia/Tokyo', LocaleSidKey = 'ja_JP', LanguageLocaleKey = 'ja', ProfileId = p.id);
- insert hpOwner2;
+ User hpOwner = new User(Test_staff__c = true, LastName = 'hp', FirstName = 'owner', Alias = 'hp', Work_Location__c = '鍖椾含', CommunityNickname = 'hpOwner', Email = 'olympus_hpowner@sunbridge.com', Username = 'olympus_hpowner@sunbridge.com', IsActive = true, EmailEncodingKey = 'ISO-2022-JP', TimeZoneSidKey = 'Asia/Tokyo', LocaleSidKey = 'ja_JP', LanguageLocaleKey = 'ja', ProfileId = p.id);
+ insert hpOwner;
+ User hpOwner2 = new User(Test_staff__c = true, LastName = 'hp2', FirstName = 'owner', Alias = 'hp2', Work_Location__c = '閲嶅簡', CommunityNickname = 'hpOwner2', Email = 'olympus_hpowner@sunbridge.com', Username = 'olympus_hpowner2@sunbridge.com', IsActive = true, EmailEncodingKey = 'ISO-2022-JP', TimeZoneSidKey = 'Asia/Tokyo', LocaleSidKey = 'ja_JP', LanguageLocaleKey = 'ja', ProfileId = p.id);
+ insert hpOwner2;
- Account hp = new Account(RecordTypeId = rectHp[0].Id, Name = 'hp', OwnerId = hpOwner.Id);
+ Account hp = new Account(RecordTypeId = rectHp[0].Id, Name = 'hp', OwnerId = hpOwner.Id);
hp.FSE_GI_Main_Leader__c = hpOwner.Id;
hp.FSE_SP_Main_Leader__c = hpOwner2.Id;
insert hp;
@@ -57,41 +64,41 @@
inquiryform.Hospital_Name__c = dpt1.Id;
List<Account> dpecList = [select Id,Department_Class__c from Account where Id =: dpt1.Id];
inquiryform.Department_Class__c = dpecList[0].Department_Class__c;
- inquiryform.Status__c ='鏈窡杩�';
+ inquiryform.Status__c ='01.鏈窡杩�';
inquiryform.Company__c ='鍖椾含鏌愭煇鏌愭祴璇曞叕鍙�';
inquiryform.Family_Name__c ='闈�';
inquiryform.Opportunity_Division__c = '璇环';
inquiryform.Contact_Name__c = contact2.Id;
- inquiryform.Reasons_options__c ='瀹㈡埛涓嶅瓨鍦�';
+ inquiryform.Reasons_options__c ='宸茬粡鏈夎浠�';
inquiryform.Phone__c = '13844756322';
inquiryform.Product1__c = '瓒呭０';
inquiryform.Request1__c = '闇�瑕佹姤浠�';
insert inquiryform;
PageReference page = new PageReference('/apex/LeadIntention');
- page.setRedirect(true);
- System.Test.setCurrentPage(page);
+ page.setRedirect(true);
+ System.Test.setCurrentPage(page);
-
- // LeadIntentionController conTest = new LeadIntentionController(new ApexPages.StandardController(dpt));
- LeadIntentionController conTest = new LeadIntentionController();
- System.Test.startTest();
- conTest.inquiryformId = inquiryform.Id;
+
+ // LeadIntentionController conTest = new LeadIntentionController(new ApexPages.StandardController(dpt));
+ LeadIntentionController conTest = new LeadIntentionController();
+ System.Test.startTest();
+ conTest.inquiryformId = inquiryform.Id;
- conTest.init();
+ conTest.init();
- conTest.searchOpp();
- conTest.sortTable();
- conTest.save();
- conTest.cancel();
+ conTest.searchOpp();
+ conTest.sortTable();
+ conTest.save();
+ conTest.cancel();
// conTest.pclInfos.reasonFlg ='1';
- conTest.saveInquiryOpts();
+ conTest.saveInquiryOpts();
}
//娴嬭瘯 閫夋嫨涓�浜涚瓫閫夋潯浠�
static testMethod void testMethod2() {
- //鍖婚櫌
+ //鍖婚櫌
List<RecordType> rectHp = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and DeveloperName = 'HP'];
if (rectHp.size() == 0) {
return;
@@ -147,12 +154,12 @@
inquiryform.Hospital_Name__c = dpt1.Id;
List<Account> dpecList = [select Id,Department_Class__c from Account where Id =: dpt1.Id];
inquiryform.Department_Class__c = dpecList[0].Department_Class__c;
- inquiryform.Status__c ='鏈窡杩�';
+ inquiryform.Status__c ='01.鏈窡杩�';
inquiryform.Company__c ='鍖椾含鏌愭煇鏌愭祴璇曞叕鍙�';
inquiryform.Family_Name__c ='闈�';
inquiryform.Opportunity_Division__c = '璇环';
inquiryform.Contact_Name__c = contact2.Id;
- inquiryform.Reasons_options__c ='瀹㈡埛涓嶅瓨鍦�';
+ inquiryform.Reasons_options__c ='宸茬粡鏈夎浠�';
inquiryform.Phone__c = '13844756322';
inquiryform.Product1__c = '瓒呭０';
inquiryform.Request1__c = '闇�瑕佹姤浠�';
diff --git a/force-app/main/default/classes/taskAlertController.cls b/force-app/main/default/classes/taskAlertController.cls
index a0b6606..77c0cf4 100644
--- a/force-app/main/default/classes/taskAlertController.cls
+++ b/force-app/main/default/classes/taskAlertController.cls
@@ -19,6 +19,7 @@
public Boolean isShowInquiry {get;set;}
public Integer InquiryNumber{ get; set; }
//2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 end
+
public taskAlertController() {
}
public PageReference init() {
@@ -90,10 +91,11 @@
this.OppWithoutConformNumber = 0;
}
//2021-11-08 mzy SWAG-C8KCZZ end
- /*//2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 start
+ //2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 start
LeadIntentionController LeadIntController = new LeadIntentionController();
LeadIntController.init();
Integer pclCount = LeadIntController.pclCount;
+ system.debug('pclCount--------------------'+pclCount);
if(pclCount>0){
InquiryNumber = pclCount;
isShowInquiry = true;
@@ -101,7 +103,7 @@
isShowInquiry = false;
InquiryNumber = 0;
}
- //2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 end */
+ //2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 end
return null;
}
diff --git a/force-app/main/default/classes/taskAlertControllerTest.cls b/force-app/main/default/classes/taskAlertControllerTest.cls
index be5895d..b417c86 100644
--- a/force-app/main/default/classes/taskAlertControllerTest.cls
+++ b/force-app/main/default/classes/taskAlertControllerTest.cls
@@ -2,7 +2,12 @@
public class taskAlertControllerTest {
@isTest
public static void test_init() {
- taskAlertController controller = new taskAlertController();
- controller.init();
+ PI_Policy_Configuration__c config = new PI_Policy_Configuration__c();
+ config.Sobject_Type__c = 'Inquiry_form__c';
+ insert config;
+ System.runAs(new User(Id = UserInfo.getUserId())) {
+ taskAlertController controller = new taskAlertController();
+ controller.init();
+ }
}
}
\ No newline at end of file
diff --git a/force-app/main/default/pages/taskAlert.page b/force-app/main/default/pages/taskAlert.page
index da90dd0..c358d3b 100644
--- a/force-app/main/default/pages/taskAlert.page
+++ b/force-app/main/default/pages/taskAlert.page
@@ -12,7 +12,6 @@
var myAllTaskNumber = '{!myTaskNumber}';
var UnfinishedTaskNumber = '{!UnfinishedTaskNumber}';
var feedbackNumber = '{!feedbackNumber}'; // 2021-11-4 yjk 寰呭弽棣堜换鍔�
-
if(myAllTaskNumber > 0 ){
str += '鎮ㄦ湭鎺ュ彈鐨勪换鍔″叡鏈�' + myAllTaskNumber +'涓紝' ;
}
@@ -102,7 +101,7 @@
</apex:outputPanel>
<!--2021-05-19 鎷涙姇鏍囬」鐩�- 椤甸潰鎻愰啋 mzy end-->
<!--2021-05-19 浠诲姟- 椤甸潰鎻愰啋 mzy start-->
- <apex:outputPanel id="alertPanel" rendered ="{!if( subTaskNumber > 0 || myTaskNumber > 0 || UnfinishedTaskNumber > 0 || feedbackNumber > 0 || OverFeedbackNumber > 0,
+ <apex:outputPanel id="alertPanel" rendered ="{!if( (subTaskNumber > 0 || myTaskNumber > 0 || UnfinishedTaskNumber > 0 || feedbackNumber > 0 || OverFeedbackNumber > 0) ,
'true','false')}" style="font-size: 1.3em; font-weight: bold;font-family: \'Microsoft YaHei\';" >
<!--2021-09-26 wangweipeng start -->
<!--鏈帴鍙椾换鍔�-->
@@ -170,7 +169,7 @@
<!--宸插畬鎴愬弽棣堜换鍔� mzy 2021-11-17 end-->
</apex:outputPanel>
- <apex:outputPanel id="alertPanel3" rendered="{!if( subTaskNumber == 0 && myTaskNumber == 0 && UnfinishedTaskNumber == 0, 'true','false')}" style="font-weight: bold;font-family: \'Microsoft YaHei\';" >
+ <apex:outputPanel id="alertPanel3" rendered="{!if( subTaskNumber == 0 && myTaskNumber == 0 && UnfinishedTaskNumber == 0 ,'true','false') }" style="font-weight: bold;font-family: \'Microsoft YaHei\';" >
<h3>
鎮ㄦ病鏈夋湭鎺ュ彈鐨勪换鍔★紝闇�瑕佽繘鍏ヤ换鍔＄鐞嗚〃璇风偣
<a href="javascript:return null;" onclick="window.open('/apex/taskManage','_blank')">杩欓噷</a>
@@ -194,19 +193,20 @@
<!-- 2021-11-09 mzy SWAG-C8KCZZ end -->
<!--2021-11-15 mzy 鏈浆鍖栬浠�-椤甸潰鎻愰啋 end -->
- <!--2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 start
+ <!--2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 start -->
<apex:outputPanel id="LeadIntention" rendered="{!isShowInquiry}" style="font-size: 1.3em; font-weight: bold;font-family: \'Microsoft YaHei\';" >
- 寰呰窡杩涚殑鍜ㄨ鍗�
+ <!-- 寰呰窡杩涚殑鍜ㄨ鍗� -->
+ {!InquiryNumber}
<apex:outputPanel rendered = "{!if( InquiryNumber > 0, 'true','false')}" style="font-family:\'\5FAE\8F6F\96C5\9ED1\'; font-weight: bold;">
<br/>
<div style='height:5px;'/>
<h3>
<apex:outputText value ="{!if(InquiryNumber > 0,'寰呰窡杩涚殑鍜ㄨ鍗�','')}"/>
- <a href="javascript:return null;" onclick="window.open('/apex/LeadIntention','_blank')"><font size="4" color="red">({!InquiryNumber}涓�)</font></a>
+ <a href="javascript:return null;" onclick="window.open('{!$Label.WaitFollowInquiryForm}','_blank')"><font size="4" color="red">({!InquiryNumber}涓�)</font></a>
</h3>
</apex:outputPanel>
</apex:outputPanel>
- 2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 end -->
+ <!--2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 end -->
<!--2021-11-15 mzy 浠诲姟绠＄悊鏀瑰杽 end-->
</apex:page>
\ No newline at end of file
--
Gitblit v1.9.1