From 2f1466af31796c1a963f26e86038ddc84471ed2e Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期六, 02 四月 2022 17:42:24 +0800
Subject: [PATCH] 目标录入相关判断修改
---
force-app/main/default/classes/SetPersonalTargetController.cls | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/classes/SetPersonalTargetController.cls b/force-app/main/default/classes/SetPersonalTargetController.cls
index a267071..913f329 100644
--- a/force-app/main/default/classes/SetPersonalTargetController.cls
+++ b/force-app/main/default/classes/SetPersonalTargetController.cls
@@ -231,10 +231,14 @@
plist.add(new Position('涓�鑸�', true));
plist.add(new Position('楂樼骇', true));
plist.add(new Position('涓荤', true));
- plist.add(new Position('鍓粡鐞�', true));
- plist.add(new Position('缁忕悊', false));
- plist.add(new Position('鍓儴闀�', false));
- plist.add(new Position('閮ㄩ暱', false));
+ //20220402 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� start
+ // plist.add(new Position('鍓粡鐞�', true));
+ // plist.add(new Position('缁忕悊', false));
+ // plist.add(new Position('鍓儴闀�', false));
+ // plist.add(new Position('閮ㄩ暱', false));
+ plist.add(new Position('缁忕悊绾�', true));
+ plist.add(new Position('鎬荤洃绾�', false));
+ //20220402 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� start
}
// 褰撳墠鐢ㄦ埛淇℃伅
@@ -768,18 +772,35 @@
}
}
if (positionNames.size() > 0) {
+
soql += ' and (';
for (Integer i = 0; i < positionNames.size(); i++) {
if (i == positionNames.size() - 1) {
soql += ' Post__c = \'' + positionNames[i] + '\'';
+ //20220402 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� start
+ if(positionNames[i] == '缁忕悊绾�'){
+ soql += ' or Post__c = \'鍓粡鐞哱' or Post__c = \'缁忕悊\'';
+ }
+ if(positionNames[i] == '鎬荤洃绾�'){
+ soql += ' or Post__c = \'鍓儴闀縗' or Post__c = \'閮ㄩ暱\'';
+ }
+ //20220402 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� end
} else {
soql += ' Post__c = \'' + positionNames[i] + '\' or';
+ //20220402 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� start
+ if(positionNames[i] == '缁忕悊绾�'){
+ soql += ' Post__c = \'鍓粡鐞哱' or Post__c = \'缁忕悊\' or ';
+ }
+ if(positionNames[i] == '鎬荤洃绾�'){
+ soql += ' Post__c = \'鍓儴闀縗' or Post__c = \'閮ㄩ暱\'';
+ }
+ //20220402 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� end
}
}
soql += ')';
}
soql += ' order by Salesdepartment__c, Province__c, UserRole.Name';
- System.debug('**********'+soql);
+ System.debug('**********123'+soql);
return Database.query(soql);
}
--
Gitblit v1.9.1