From e086d26f5ea28d42f78f836d6a8be5c686c1f36d Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期二, 17 五月 2022 17:31:38 +0800
Subject: [PATCH] 【委托】【期初修改4月6日开始修改】目标录入相关判断修改
---
force-app/main/default/pages/SetPersonalTarget.page | 4 ++--
force-app/main/default/classes/SetPersonalTargetController.cls | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
2 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/classes/SetPersonalTargetController.cls b/force-app/main/default/classes/SetPersonalTargetController.cls
index 476e32d..1e37e85 100644
--- a/force-app/main/default/classes/SetPersonalTargetController.cls
+++ b/force-app/main/default/classes/SetPersonalTargetController.cls
@@ -228,7 +228,7 @@
// 鑱蜂綅
if (plist == null) {
plist = new List<Position>();
- plist.add(new Position('涓�鑸�', true));
+ plist.add(new Position('涓撳憳', true)); //20220517 lt SWAG-CD28H3
plist.add(new Position('楂樼骇', true));
plist.add(new Position('涓荤', true));
//20220402 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� start
@@ -605,7 +605,7 @@
}
private List<User> getUserList(List<String> UserInfoList) {//鏍规嵁涓婁紶鏂囦欢涓緱鏈儴锛岀渷浠斤紝鎷呭綋锛岃亴浣� 寰楀埌浜唘ser 淇℃伅
String soql = 'select Id, UserInfos__c, Salesdepartment__c, Province__c, Alias, Product_specialist_incharge_product__c,Responsible_for_Products_Concurrently__c, Use_Start_Date__c,'
- + ' ProfileId, Profile.Name, UserRoleId, UserRole.Name, Sales_Speciality__c, Post__c,Job_Category__c'
+ + ' ProfileId, Profile.Name, UserRoleId, UserRole.Name, Sales_Speciality__c, HR_Post__c,Job_Category__c'
+ ' from User where IsActive = true and Test_staff__c = false and UserType = \'Standard\' '
+ ' and Salesdepartment__c <> \'7.鑳介噺\' '
+ ' and UserInfos__c IN :UserInfoList order by Salesdepartment__c, Province__c';
@@ -717,7 +717,7 @@
// 銉︺兗銈躲伄妞滅储
private List<User> getUserList(Boolean searchByDpt, Boolean searchByProvince, Boolean defaultSearch) {
String soql = 'select Id, Salesdepartment__c, Province__c, Alias, Product_specialist_incharge_product__c,Responsible_for_Products_Concurrently__c, Use_Start_Date__c,'
- + ' ProfileId, Profile.Name, UserRoleId, UserRole.Name, Sales_Speciality__c, Post__c'
+ + ' ProfileId, Profile.Name, UserRoleId, UserRole.Name, Sales_Speciality__c, HR_Post__c'
+ ' from User where IsActive = true and Test_staff__c = false and UserType = \'Standard\' '
// CHAN-BBLCYP 20190509 LHJ Start
+ ' and Salesdepartment__c <> \'7.鑳介噺\' ';
@@ -766,19 +766,27 @@
// 鑱蜂綅鏉′欢
List<String> positionNames = new List<String>();
+ String s1 = '缁忕悊';
+ String s2 = '鎬荤洃';
for (Position p : plist) {
if (p.check) {
- positionNames.add(p.positionName);
+ //positionNames.add(p.positionName);
//20220406 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� start
- if(p.positionName == '缁忕悊绾�'){
- positionNames.add('鍓粡鐞�');
- positionNames.add('缁忕悊');
+ //20220517 lt SWAG-CD28H3 娉ㄩ噴
+ if(p.positionName == '楂樼骇'){
+ positionNames.add('楂樼骇涓撳憳');
+ }else{
+ positionNames.add(p.positionName);
}
- if(p.positionName == '鎬荤洃绾�'){
- positionNames.add('鍓儴闀�');
- positionNames.add('閮ㄩ暱');
- positionNames.add('鎬荤洃');
- }
+ // if(p.positionName == '缁忕悊绾�'){
+ // positionNames.add('鍓粡鐞�');
+ // positionNames.add('缁忕悊');
+ // }
+ // if(p.positionName == '鎬荤洃绾�'){
+ // positionNames.add('鍓儴闀�');
+ // positionNames.add('閮ㄩ暱');
+ // positionNames.add('鎬荤洃');
+ // }
//20220406 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀筫nd
}
}
@@ -787,9 +795,29 @@
soql += ' and (';
for (Integer i = 0; i < positionNames.size(); i++) {
if (i == positionNames.size() - 1) {
- soql += ' Post__c = \'' + positionNames[i] + '\'';
+ //20220517 lt SWAG-CD28H3 Start
+ if(positionNames[i] != '缁忕悊绾�' && positionNames[i] != '鎬荤洃绾�'){
+ soql += ' HR_Post__c = \'' + positionNames[i] + '\'';
+ }
+ else if(positionNames[i] == '缁忕悊绾�'){
+ soql += ' HR_Post__c like \'%' + s1 + '%\'';
+ }
+ else if(positionNames[i] == '鎬荤洃绾�'){
+ soql += ' HR_Post__c like \'%' + s2 + '%\'';
+ }
+ //20220517 lt SWAG-CD28H3 End
} else {
- soql += ' Post__c = \'' + positionNames[i] + '\' or';
+ //20220517 lt SWAG-CD28H3 Start
+ if(positionNames[i] != '缁忕悊绾�' && positionNames[i] != '鎬荤洃绾�'){
+ soql += ' HR_Post__c = \'' + positionNames[i] + '\' or';
+ }
+ else if(positionNames[i] == '缁忕悊绾�'){
+ soql += ' HR_Post__c like \'%' + s1 + '%\' or';
+ }
+ else if(positionNames[i] == '鎬荤洃绾�'){
+ soql += ' HR_Post__c like \'%' + s2 + '%\' or';
+ }
+ //20220517 lt SWAG-CD28H3 End
}
}
soql += ')';
diff --git a/force-app/main/default/pages/SetPersonalTarget.page b/force-app/main/default/pages/SetPersonalTarget.page
index c1de14c..e53ff1c 100644
--- a/force-app/main/default/pages/SetPersonalTarget.page
+++ b/force-app/main/default/pages/SetPersonalTarget.page
@@ -374,7 +374,7 @@
<th width="70px" class="headerRow booleanColumn">鐪�</th>
<th class="headerRow booleanColumn">瑙掕壊</th>
<th width="70px" class="headerRow booleanColumn">鎷呭綋</th>
- <th width="70px" class="headerRow booleanColumn">鑱屼綅</th>
+ <th width="70px" class="headerRow booleanColumn">HR閫氱敤鑱岀骇</th> <!-- 20220517 lt SWAG-CD28H3 Update -->
<th width="70px" class="headerRow booleanColumn">璐熻矗<br/>浜у搧鍒嗙被锛堜富锛�</th>
<!--wangweipeng 20210615-->
<th width="70px" class="headerRow booleanColumn">璐熻矗<br/>浜у搧鍒嗙被锛堝吋锛�</th>
@@ -411,7 +411,7 @@
<td class="dataCell">{!dbs.user.Province__c}</td>
<td class="dataCell">{!dbs.user.UserRole.Name}</td>
<td class="dataCell">{!dbs.user.Alias}</td>
- <td class="dataCell">{!dbs.user.Post__c}</td>
+ <td class="dataCell">{!dbs.user.HR_Post__c}</td> <!-- 20220517 lt SWAG-CD28H3 Update -->
<td class="dataCell" style="word-wrap:break-word;max-width:70px;">{!SUBSTITUTE(dbs.user.Product_specialist_incharge_product__c, ";", "; ")}</td>
<!--wangweipeng 20210615-->
<td class="dataCell" style="word-wrap:break-word;max-width:70px;">{!SUBSTITUTE(dbs.user.Responsible_for_Products_Concurrently__c, ";", "; ")}</td>
--
Gitblit v1.9.1