From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/Dealer_enquiryController.cls | 301 +++++++++++++++++++++++++------------------------
1 files changed, 152 insertions(+), 149 deletions(-)
diff --git a/force-app/main/default/classes/Dealer_enquiryController.cls b/force-app/main/default/classes/Dealer_enquiryController.cls
index 823feb2..f9e9d50 100644
--- a/force-app/main/default/classes/Dealer_enquiryController.cls
+++ b/force-app/main/default/classes/Dealer_enquiryController.cls
@@ -74,8 +74,6 @@
textOpts.add(new SelectOption('Agency_Hospital__r.Hospital__r.Salesdepartment_HP__c', '閿�鍞湰閮�'));
textOpts.add(new SelectOption('Agency_Hospital__r.Hospital__r.State_Master__r.Name', '鐪�'));
textOpts.add(new SelectOption('Agency_Hospital__r.Hospital__r.City_Master__r.Name', '甯�'));
-
-
//鏃ユ湡瀛楁涓嬫媺鍒楄〃
timeOpts = new List<SelectOption>();
timeOpts.add(new SelectOption('', '--鏃�--'));
@@ -110,8 +108,8 @@
limitOpts.add(new SelectOption('20', '20'));
limitOpts.add(new SelectOption('50', '50'));
limitOpts.add(new SelectOption('100', '100'));
- limitOpts.add(new SelectOption('200', '200'));
- limitOpts.add(new SelectOption('1000', '鍏ㄩ儴'));
+ limitOpts.add(new SelectOption('200', '200'));
+ limitOpts.add(new SelectOption('1000', '鍏ㄩ儴'));
//鏁版嵁鏄剧ず榛樿鏉℃暟
limits = '20';
}
@@ -243,126 +241,148 @@
String newNumtext = numtext.trim();
String str = makeTextSql(numtext1, numtext2, newNumtext);
soql += str;
- System.debug('++++++++++++++++++++++++++++'+soql);
}
- if (!String.isBlank(timetext1)) {
- if (tmpAO != null && tmpAO.MaxActivityDate__c != null && tmpBo != null) {
- if (tmpAO.MaxActivityDate__c.month() >= 10 && tmpAO.MaxActivityDate__c.day() >= 10 ) {
- if (tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() >= 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-' +
- tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-' +
- tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
- } else if (tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() < 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-' +
- tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-' +
- tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
- } else if (tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() >= 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-' +
- tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-0' +
- tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
- } else if (tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() < 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-' +
- tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-0' +
- tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
+ if(!String.isBlank(timetext1)){
+ if(tmpAO != null && tmpAO.MaxActivityDate__c != null && tmpBo != null){
+ if(tmpAO.MaxActivityDate__c.month() >= 10 && tmpAO.MaxActivityDate__c.day() >= 10 ){
+ if(tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() >= 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-' +
+ tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-' +
+ tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
}
- } else if (tmpAO.MaxActivityDate__c.month() >= 10 && tmpAO.MaxActivityDate__c.day() < 10) {
- if (tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() >= 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-' +
- tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-' +
- tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
- } else if (tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() < 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-' +
- tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-' +
- tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
- } else if (tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() >= 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-' +
- tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-0' +
- tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
- } else if (tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() < 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-' +
- tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-0' +
- tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
+ else if(tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() < 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-' +
+ tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-' +
+ tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
}
- } else if (tmpAO.MaxActivityDate__c.month() < 10 && tmpAO.MaxActivityDate__c.day() >= 10) {
- if (tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() >= 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-0' +
- tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-' +
- tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
- } else if (tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() < 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-0' +
- tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-' +
- tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
- } else if (tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() >= 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-0' +
- tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-0' +
- tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
- } else if (tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() < 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-0' +
- tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-0' +
- tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
+ else if(tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() >= 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-' +
+ tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-0' +
+ tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
}
- } else if (tmpAO.MaxActivityDate__c.month() < 10 && tmpAO.MaxActivityDate__c.day() < 10) {
- if (tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() >= 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-0' +
- tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-' +
- tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
- } else if (tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() < 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-0' +
- tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-' +
- tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
- } else if (tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() >= 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-0' +
- tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-0' +
- tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
- } else if (tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() < 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-0' +
- tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
- ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year() + '-0' +
- tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
+ else if(tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() < 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-' +
+ tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-0' +
+ tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
}
}
- } else if (tmpAO != null && tmpAO.MaxActivityDate__c == null && tmpBo == null) {
- if (tmpAO.MaxActivityDate__c.month() >= 10 && tmpAO.MaxActivityDate__c.day() >= 10 ) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-' +
- tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day();
- } else if (tmpAO.MaxActivityDate__c.month() >= 10 && tmpAO.MaxActivityDate__c.day() < 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-' +
- tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day();
- } else if (tmpAO.MaxActivityDate__c.month() < 10 && tmpAO.MaxActivityDate__c.day() >= 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-0' +
- tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day();
- } else if (tmpAO.MaxActivityDate__c.month() < 10 && tmpAO.MaxActivityDate__c.day() < 10) {
- soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year() + '-0' +
- tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day();
+ else if(tmpAO.MaxActivityDate__c.month() >= 10 && tmpAO.MaxActivityDate__c.day() < 10){
+ if(tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() >= 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-' +
+ tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-' +
+ tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
+ }
+ else if(tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() < 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-' +
+ tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-' +
+ tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
+ }
+ else if(tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() >= 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-' +
+ tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-0' +
+ tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
+ }
+ else if(tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() < 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-' +
+ tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-0' +
+ tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
+ }
}
- } else if (tmpAO == null && tmpAO.MaxActivityDate__c == null && tmpBo != null) {
- if (tmpBo.MaxActivityDate__c.month() >= 10 && tmpBo.MaxActivityDate__c.day() >= 10 ) {
- soql += ' AND ' + timetext1 + '<=' + tmpBo.MaxActivityDate__c.year() + '-' +
- tmpBo.MaxActivityDate__c.month() + '-' + tmpBo.MaxActivityDate__c.day();
- } else if (tmpBo.MaxActivityDate__c.month() >= 10 && tmpBo.MaxActivityDate__c.day() < 10) {
- soql += ' AND ' + timetext1 + '<=' + tmpBo.MaxActivityDate__c.year() + '-' +
- tmpBo.MaxActivityDate__c.month() + '-0' + tmpBo.MaxActivityDate__c.day();
- } else if (tmpBo.MaxActivityDate__c.month() < 10 && tmpBo.MaxActivityDate__c.day() >= 10) {
- soql += ' AND ' + timetext1 + '<=' + tmpBo.MaxActivityDate__c.year() + '-0' +
- tmpBo.MaxActivityDate__c.month() + '-' + tmpBo.MaxActivityDate__c.day();
- } else if (tmpBo.MaxActivityDate__c.month() < 10 && tmpBo.MaxActivityDate__c.day() < 10) {
- soql += ' AND ' + timetext1 + '<=' + tmpBo.MaxActivityDate__c.year() + '-0' +
- tmpBo.MaxActivityDate__c.month() + '-0' + tmpBo.MaxActivityDate__c.day();
+ else if(tmpAO.MaxActivityDate__c.month() < 10 && tmpAO.MaxActivityDate__c.day() >= 10){
+ if(tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() >= 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-0' +
+ tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-' +
+ tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
+ }
+ else if(tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() < 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-0' +
+ tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-' +
+ tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
+ }
+ else if(tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() >= 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-0' +
+ tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-0' +
+ tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
+ }
+ else if(tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() < 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-0' +
+ tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-0' +
+ tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
+ }
+ }
+ else if(tmpAO.MaxActivityDate__c.month() < 10 && tmpAO.MaxActivityDate__c.day() < 10){
+ if(tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() >= 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-0' +
+ tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-' +
+ tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
+ }
+ else if(tmpBO.MaxActivityDate__c.month() >= 10 && tmpBO.MaxActivityDate__c.day() < 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-0' +
+ tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-' +
+ tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
+ }
+ else if(tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() >= 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-0' +
+ tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-0' +
+ tmpBO.MaxActivityDate__c.month() + '-' + tmpBO.MaxActivityDate__c.day();
+ }
+ else if(tmpBO.MaxActivityDate__c.month() < 10 && tmpBO.MaxActivityDate__c.day() < 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-0' +
+ tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day() +
+ ' AND ' + timetext1 + '<=' + tmpBO.MaxActivityDate__c.year()+ '-0' +
+ tmpBO.MaxActivityDate__c.month() + '-0' + tmpBO.MaxActivityDate__c.day();
+ }
+ }
+ }
+ else if(tmpAO != null && tmpAO.MaxActivityDate__c == null && tmpBo == null){
+ if(tmpAO.MaxActivityDate__c.month() >= 10 && tmpAO.MaxActivityDate__c.day() >= 10 ){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-' +
+ tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day();
+ }
+ else if(tmpAO.MaxActivityDate__c.month() >= 10 && tmpAO.MaxActivityDate__c.day() < 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-' +
+ tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day();
+ }
+ else if(tmpAO.MaxActivityDate__c.month() < 10 && tmpAO.MaxActivityDate__c.day() >= 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-0' +
+ tmpAO.MaxActivityDate__c.month() + '-' + tmpAO.MaxActivityDate__c.day();
+ }
+ else if(tmpAO.MaxActivityDate__c.month() < 10 && tmpAO.MaxActivityDate__c.day() < 10){
+ soql += ' AND ' + timetext1 + '>=' + tmpAO.MaxActivityDate__c.year()+ '-0' +
+ tmpAO.MaxActivityDate__c.month() + '-0' + tmpAO.MaxActivityDate__c.day();
+ }
+ }
+ else if(tmpAO == null && tmpAO.MaxActivityDate__c == null && tmpBo != null){
+ if(tmpBo.MaxActivityDate__c.month() >= 10 && tmpBo.MaxActivityDate__c.day() >= 10 ){
+ soql += ' AND ' + timetext1 + '<=' + tmpBo.MaxActivityDate__c.year()+ '-' +
+ tmpBo.MaxActivityDate__c.month() + '-' + tmpBo.MaxActivityDate__c.day();
+ }
+ else if(tmpBo.MaxActivityDate__c.month() >= 10 && tmpBo.MaxActivityDate__c.day() < 10){
+ soql += ' AND ' + timetext1 + '<=' + tmpBo.MaxActivityDate__c.year()+ '-' +
+ tmpBo.MaxActivityDate__c.month() + '-0' + tmpBo.MaxActivityDate__c.day();
+ }
+ else if(tmpBo.MaxActivityDate__c.month() < 10 && tmpBo.MaxActivityDate__c.day() >= 10){
+ soql += ' AND ' + timetext1 + '<=' + tmpBo.MaxActivityDate__c.year()+ '-0' +
+ tmpBo.MaxActivityDate__c.month() + '-' + tmpBo.MaxActivityDate__c.day();
+ }
+ else if(tmpBo.MaxActivityDate__c.month() < 10 && tmpBo.MaxActivityDate__c.day() < 10){
+ soql += ' AND ' + timetext1 + '<=' + tmpBo.MaxActivityDate__c.year()+ '-0' +
+ tmpBo.MaxActivityDate__c.month() + '-0' + tmpBo.MaxActivityDate__c.day();
}
}
}
@@ -404,7 +424,7 @@
}
for (Agency_Opportunity__c info : InfoList) {
Opportunity tmpopp = OpportMap.get(info.Change_To_Opportunity__r.Id);
- if (tmpopp == null) {
+ if(tmpopp == null){
tmpopp = new Opportunity();
}
oppinfoList.add(new OpportunityInfo(info, tmpopp));
@@ -416,19 +436,18 @@
//鏄剧ず鎻愮ず鎿嶄綔淇℃伅
if (String.isBlank(this.saveType) && String.isBlank(this.sortKey)) {
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '鍙栧緱鏈�杩戠殑 ' + oppCount + ' 鏉℃暟鎹�'));
- } else if (!String.isBlank(this.sortKey)) {
+ } else if(!String.isBlank(this.sortKey)){
if (oppCount > oppLimit) {
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '鏁版嵁瓒呰繃' + oppLimit + '浠讹紝鍙樉绀哄墠' + oppLimit + '浠�'));
} else {
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '鍏辨湁 ' + oppCount + ' 鏉℃暟鎹�'));
}
- } else {
+ }else {
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '鍏辨湁 ' + oppCount + ' 鏉℃暟鎹�'));
}
}
//妫�绱㈡潯浠讹細鏁版嵁瀛楁1锛屾暟鎹瓧娈�2锛屾暟鎹瓧娈�3鍧囨弧瓒宠繘鍏ユ鏂规硶 鍒ゆ柇澶氱鎯呭喌
private String makeTextSql(String textOpts, String equalOpts, String numtext) {
-
String soql = '';
if (!String.isBlank(textOpts)) {
//瀵绘壘妫�绱㈡潯浠跺寘鍚�� 鈥� 绌烘牸鐨勫閲嶆绱㈡潯浠�
@@ -442,24 +461,14 @@
for (Integer icount = 0; icount < vals.size(); icount++) {
String val = vals[icount];
- if (equalOpts == 'contains') {
- cSql = this.makeTextSqlStr(textOpts, equalOpts, val);
- soql += cSql;
-
- if (icount < vals.size() - 1) {
- soql += ' OR ';
- }
- } else if (equalOpts == 'notcontains') {
- cSql = this.makeTextSqlStr(textOpts, equalOpts, val);
- soql += cSql;
- if (icount < vals.size() - 1) {
- soql += ' AND ';
- }
+ cSql = this.makeTextSqlStr(textOpts, equalOpts, val);
+ system.debug(cSql);
+ soql += cSql;
+ if (icount < vals.size() - 1) {
+ soql += ' OR ';
}
-
}
soql += ')';
-
}
//瀵绘壘妫�绱㈡潯浠跺寘鍚�橈紝鈥� 閫楀彿鐨勫閲嶆绱㈡潯浠�
else if ((equalOpts == '=' || equalOpts == '<>') && numtext.contains(',')) {
@@ -485,19 +494,16 @@
else if (equalOpts.equals('contains') || equalOpts.equals('notcontains')) {
if (equalOpts.equals('contains')) {
soql += ' AND ' + textOpts + ' LIKE \'%' + numtext + '%\'';
-
} else if (equalOpts.equals('notcontains')) {
soql += ' AND ( NOT ' + textOpts + ' LIKE \'%' + numtext + '%\' ) ';
-
}
}
//妫�绱㈣繛鎺ョ涓虹瓑浜庝互鍙婁笉绛変簬
else if (equalOpts == '=' || equalOpts == '<>') {
soql += 'AND ' + textOpts + equalOpts + '\'' + numtext + '\'';
}
-
//璧峰瀛楃
- else if (equalOpts == 'starts with') {
+ else if (equalOpts == 'starts with'){
soql += 'AND ' + textOpts + ' LIKE \'' + numtext + '%\'';
}
//妫�绱㈣繛鎺ョ鐨勫叾浠栨儏鍐�
@@ -514,18 +520,16 @@
}
//妫�绱㈡潯浠讹細鏁版嵁瀛楁1锛屾暟鎹瓧娈�2锛屾暟鎹瓧娈�3鍧囨弧瓒筹紝骞朵笖杩涘叆makeTextSql锛堬級涔嬪悗锛屽唴鍚暟鎹瓧娈靛寘鍚绉嶆椂杩涘叆姝ゆ柟娉曘��
@TestVisible private String makeTextSqlStr(String textOpts, String equalOpts, String val) {
-
String soql = '';
if (!String.isBlank(textOpts)) {
String tmpVal = val;
if (!String.isBlank(tmpVal)) {
if (equalOpts == 'contains' || equalOpts == 'notcontains') {
- if (equalOpts == 'contains') {
- soql += ' ' + textOpts + ' LIKE \'%' + val + '%\'' ;
- } else if (equalOpts == 'notcontains') {
- soql += ' ( NOT ' + textOpts + ' LIKE \'%' + val + '%\' ) ' ;
- }
-
+ if(equalOpts == 'contains'){
+ soql += ' ' + textOpts + ' LIKE \'%' + val + '%\'' ;
+ } else if(equalOpts == 'notcontains'){
+ soql += ' ( NOT ' + textOpts + ' LIKE \'%' + val + '%\' ) ' ;
+ }
} else if (equalOpts == '=' || equalOpts == '<>') {
if (equalOpts == '=') {
soql += ' AND ' + textOpts + ' = ' + val ;
@@ -537,7 +541,6 @@
soql = ' AND ' + textOpts;
if (equalOpts == '=') {
soql += ' = ' + tmpVal;
-
} else if (equalOpts == '<>') {
soql += ' <> ' + tmpVal;
} else if (equalOpts == 'contains') {
@@ -570,7 +573,7 @@
if (oi.changeFlg == '1') {
oi.changeFlg = '0';
updTarget.add(oi.AgcOpp);
-
+
}
if (oi.changeFlgRt == '1' && oi.opp.id != null) {
oi.changeFlgRt = '0';
--
Gitblit v1.9.1