From e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 11:22:08 +0800
Subject: [PATCH] Merge branch 'master' into LightningUpgradeProject
---
force-app/main/default/classes/SetProvinceTargetController.cls | 352 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 275 insertions(+), 77 deletions(-)
diff --git a/force-app/main/default/classes/SetProvinceTargetController.cls b/force-app/main/default/classes/SetProvinceTargetController.cls
index 3486ec1..1658657 100644
--- a/force-app/main/default/classes/SetProvinceTargetController.cls
+++ b/force-app/main/default/classes/SetProvinceTargetController.cls
@@ -28,9 +28,14 @@
salesDpt.add(new SelectOption('1.鍗庡寳','1.鍗庡寳'));
salesDpt.add(new SelectOption('2.涓滃寳','2.涓滃寳'));
salesDpt.add(new SelectOption('3.瑗垮寳','3.瑗垮寳'));
- salesDpt.add(new SelectOption('4.鍗庝笢','4.鍗庝笢'));
- salesDpt.add(new SelectOption('5.鍗庡崡','5.鍗庡崡'));
- salesDpt.add(new SelectOption('6.瑗垮崡','6.瑗垮崡'));
+ // DB202305259561 fy 20230517 start
+ // salesDpt.add(new SelectOption('4.鍗庝笢','4.鍗庝笢'));
+ // salesDpt.add(new SelectOption('5.鍗庡崡','5.鍗庡崡'));
+ // salesDpt.add(new SelectOption('6.瑗垮崡','6.瑗垮崡'));
+ salesDpt.add(new SelectOption('4.瑗垮崡','4.瑗垮崡'));
+ salesDpt.add(new SelectOption('5.鍗庝笢','5.鍗庝笢'));
+ salesDpt.add(new SelectOption('6.鍗庡崡','6.鍗庡崡'));
+ // DB202305259561 fy 20230517 end
return salesDpt;
}
@@ -57,20 +62,33 @@
private Map<String, OCM_Management_Province__c> OCM_MpMap;
private List<String> AllOwnerSystem;
private static String[] CIfromass = new String[] {'GI','ET','BF','GDP'};
- private static String[] SPfromass = new String[] {'GS','URO','GYN','ENT','ENG'};
+ //DB202305277681 fy 20230517 start
+ // private static String[] SPfromass = new String[] {'GS','URO','GYN','ENT','ENG'};
+ private static String[] SPfromass = new String[] {'GS','URO','GYN','ENT','ENG1','ENG2'};
+ //DB202305277681 fy 20230517 end
// 閲戦鍒嗙被
//private static String[] amountCategory = new String[] {'GI','ET','BF','GS','URO','GYN','ENT','OTH'};
//鐪佺洰鏍�(SetProvinceTarget):闅愯棌OTH銆傝拷鍔燛NG銆�
+ //DB202305277681 fy 20230517 start
// private static String[] amountCategory = new String[] {'GI','ET','BF','GS','URO','GYN','ENT','ENG'};
+ private static String[] amountCategory = new String[] {'GI','ET','BF','GS','URO','GYN','ENT','ENG1','ENG2'};
+ //DB202305277681 fy 20230517 end
//SWAG-C9YDDE 2021/12/28 fy start
- private static String[] amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};
+ // private static String[] amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};
//SWAG-C9YDDE 2021/12/28 fy end
//CHAN-BDQBLX 20210129 you start
public string csvAsString {get; set;}
public String[] csvFileLines {get; set;}
- // private static String[] titlepage = new String[] {'閿�鍞湰閮�', '鐪�', '鎷呭綋','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};
+ //fy 淇敼 start
+ public String users6_ID = System.Label.s6_ID;
+ public boolean JianDangfalg { get; set; }
+ //fy 淇敼 end
+ //DB202305277681 fy 20230517 start
+ // private static String[] titlepage = new String[] {'閿�鍞湰閮�', '鐪�','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};
+ private static String[] titlepage = new String[] {'閿�鍞湰閮�', '鐪�','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT','ENG1','ENG2'};
+ //DB202305277681 fy 20230517 start
//SWAG-C9YDDE 2021/12/28 fy start
- private static String[] titlepage = new String[] {'閿�鍞湰閮�', '鐪�', '鎷呭綋','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};
+ // private static String[] titlepage = new String[] {'閿�鍞湰閮�', '鐪�', '鎷呭綋','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};
//SWAG-C9YDDE 2021/12/28 fy end
public Integer detailCountLimit{get;private set;}
private Map<String, Opportunity> oppsMap1;
@@ -79,6 +97,35 @@
//CHAN-BDQBLX 20210129 you end
// 鐢婚潰鍒濆鍖�
public Pagereference init() {
+ JianDangfalg=false;
+ //fy 淇敼 20220412
+ System.debug('users6_ID: '+users6_ID);
+ System.debug('褰撳墠鐢ㄦ埛绠�妗�: '+UserInfo.getProfileId());
+ String userProfileId = UserInfo.getProfileId();
+ if(!String.isBlank(userProfileId)){
+ userProfileId=userProfileId.substring(0,15);
+ }
+ System.debug('褰撳墠鐢ㄦ埛绠�妗ｆ埅鍙�: '+userProfileId);
+ List<String> user6IdList = users6_ID.split(',');
+ for(String user6id : user6IdList){
+ if(user6id==userProfileId){
+ // if(user6id=='00e10000000xnpR'){
+ JianDangfalg=true;
+ break;
+ }
+ }
+ System.debug('user6IdList: '+user6IdList);
+ System.debug('JianDangfalg: '+JianDangfalg);
+ if(JianDangfalg){
+ //DB202305277681 fy 20230517 start
+ // amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};
+ // titlepage = new String[] {'閿�鍞湰閮�', '鐪�','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};
+ amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG1','ENG2'};
+ titlepage = new String[] {'閿�鍞湰閮�', '鐪�','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT','ENG1','ENG2'};
+ //DB202305277681 fy 20230517 end
+ }
+ System.debug('amountCategory===: '+amountCategory);
+ //fy 淇敼 20220412
//CHAN-BDQBLX 20210129 you start
oppsMap1 = new Map<String, Opportunity>();
detailCountLimit = 10000;
@@ -178,15 +225,33 @@
doubleOTH.add(Double.valueOf(strOTH));
}
proportion.put('OTH', doubleOTH);
-
- String strObjectiveProportionENG = System.Label.ObjectiveProportionENG;
- List<String> objectiveProportionENG = strObjectiveProportionENG.split(',');
- List<Double> doubleENG = new List<Double>();
- for (String strENG : objectiveProportionENG) {
- doubleENG.add(Double.valueOf(strENG));
+ //DB202305277681 fy 20230517 start
+ // String strObjectiveProportionENG = System.Label.ObjectiveProportionENG;
+ // List<String> objectiveProportionENG = strObjectiveProportionENG.split(',');
+ // List<Double> doubleENG = new List<Double>();
+ // for (String strENG : objectiveProportionENG) {
+ // doubleENG.add(Double.valueOf(strENG));
+ // }
+ // proportion.put('ENG', doubleENG);
+ // proportion.put('_ENG', doubleENG);
+ String strObjectiveProportionENG1 = System.Label.ObjectiveProportionENG;
+ List<String> objectiveProportionENG1 = strObjectiveProportionENG1.split(',');
+ List<Double> doubleENG1 = new List<Double>();
+ for (String strENG1 : objectiveProportionENG1) {
+ doubleENG1.add(Double.valueOf(strENG1));
}
- proportion.put('ENG', doubleENG);
- proportion.put('_ENG', doubleENG);
+ proportion.put('ENG1', doubleENG1);
+ proportion.put('_ENG1', doubleENG1);
+
+ String strObjectiveProportionENG2 = System.Label.ObjectiveProportionENG;
+ List<String> objectiveProportionENG2 = strObjectiveProportionENG2.split(',');
+ List<Double> doubleENG2 = new List<Double>();
+ for (String strENG2 : objectiveProportionENG2) {
+ doubleENG2.add(Double.valueOf(strENG2));
+ }
+ proportion.put('ENG2', doubleENG2);
+ proportion.put('_ENG2', doubleENG2);
+ //DB202305277681 fy 20230517 end
}
// 褰撳墠鐢ㄦ埛淇℃伅
if (loginUser == null) {
@@ -206,7 +271,7 @@
}
// 鏁版嵁璧嬪��
setBean(iYear);
-
+ system.debug('dataBeans+++'+dataBeans[0]);
return null;
}
//SWAG-BB48QB 鍒ゆ柇褰撳墠鏃堕棿鏄惁鏄�4鏈�15鏃ヤ箣鍚� start
@@ -307,6 +372,12 @@
//瀵煎叆鏂规硶
public PageReference importCSVFile() {
try{
+ if(JianDangfalg){
+ //DB202305277681 fy 20230517 start
+ // titlepage = new String[] {'閿�鍞湰閮�', '鐪�','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};
+ titlepage = new String[] {'閿�鍞湰閮�', '鐪�','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG1','ENG2'};
+ //DB202305277681 fy 20230517 end
+ }
String csvData = ApexPages.currentPage().getParameters().get('csvData');
// 灏嗗唴瀹硅浆鎹㈡垚涓轰腑鏂�
if(!Test.isRunningTest()){
@@ -324,12 +395,17 @@
if (csvFileLines.size() > 0) {
string[] titlecsv = csvFileLines[0].trim().split(',');//
system.debug(titlecsv + '==titlepage==' + titlepage);
- for (integer j = 0; j < titlecsv.size(); j++) {
- if (!titlepage.contains(titlecsv[j])) {
- system.debug('琛ㄥご涓嶄竴鑷村緱鍒�===' + titlecsv[j]);
- ValFlag = true;
- exportByVal = '琛ㄥご涓嶄竴鑷达紝璇蜂弗鏍兼寜鐓у鍑烘ā鏉垮～鍐�';
- break;
+ if(titlepage.size()!=titlecsv.size()){
+ ValFlag = true;
+ exportByVal = '琛ㄥご涓嶄竴鑷达紝璇蜂弗鏍兼寜鐓у鍑烘ā鏉垮～鍐�';
+ }else{
+ for (integer j = 0; j < titlecsv.size(); j++) {
+ if (!titlepage.contains(titlecsv[j])) {
+ system.debug('琛ㄥご涓嶄竴鑷村緱鍒�===' + titlecsv[j]);
+ ValFlag = true;
+ exportByVal = '琛ㄥご涓嶄竴鑷达紝璇蜂弗鏍兼寜鐓у鍑烘ā鏉垮～鍐�';
+ break;
+ }
}
}
}
@@ -370,17 +446,50 @@
// for (User userl : userList) {
// userMap.put(userl.Alias, userl);
// }
- //2021/12/28 涓棿琛ㄥ瘎瀛樻暟鎹� by ld fy
- Integer GDP_Number = 2;
- //2021/12/28 涓棿琛ㄥ瘎瀛樻暟鎹� by ld fy
- Integer GI_Number = 3;
- Integer ET_Number = 4;
- Integer BF_Number = 5;
- Integer GS_Number = 6;
- Integer URO_Number = 7;
- Integer GYN_Number = 8;
- Integer ENT_Number = 9;
- Integer ENG_Number = 10;
+ //fy 淇敼 20220412
+ Integer GDP_Number = 0;
+ Integer GI_Number = 0;
+ Integer ET_Number = 0;
+ Integer BF_Number = 0;
+ Integer GS_Number = 0;
+ Integer URO_Number = 0;
+ Integer GYN_Number = 0;
+ Integer ENT_Number = 0;
+ //DB202305277681 fy 20230517 start
+ // Integer ENG_Number = 0;
+ Integer ENG1_Number = 0;
+ Integer ENG2_Number = 0;
+ //DB202305277681 fy 20230517 end
+ if(JianDangfalg){
+ //2021/12/28 涓棿琛ㄥ瘎瀛樻暟鎹� by ld fy
+ GDP_Number = 2;
+ //2021/12/28 涓棿琛ㄥ瘎瀛樻暟鎹� by ld fy
+ GI_Number = 3;
+ ET_Number = 4;
+ BF_Number = 5;
+ GS_Number = 6;
+ URO_Number = 7;
+ GYN_Number = 8;
+ ENT_Number = 9;
+ //DB202305277681 fy 20230517 start
+ // ENG_Number = 10;
+ ENG1_Number = 10;
+ ENG2_Number = 11;
+ //DB202305277681 fy 20230517 end
+ }else{
+ GI_Number = 2;
+ ET_Number = 3;
+ BF_Number = 4;
+ GS_Number = 5;
+ URO_Number = 6;
+ GYN_Number = 7;
+ ENT_Number = 8;
+ //DB202305277681 fy 20230517 start
+ // ENG_Number = 9;
+ ENG1_Number = 9;
+ ENG2_Number = 10;
+ //DB202305277681 fy 20230517 end
+ }
upsertPGSIList = new List<Provincial_Goal_Setting_Input__c>();//鍒濆鍖栵紝瑙ｅ喅閲嶅瀵煎叆鏁版嵁 id閲嶅寰楅棶棰�
for (String key : szMap.keySet()) {
//鍙栫敤鎴风殑Id
@@ -414,9 +523,12 @@
//2021/12/28 涓棿琛ㄥ瘎瀛樻暟鎹� by ld fy
Provincial_Goal_Setting_Input__c upsertPGSI = new Provincial_Goal_Setting_Input__c();
//鑾峰彇瀵煎叆鏁伴噺
- Decimal GDP_Amount = String.isNotBlank(csvRecordData[GDP_Number]) ? Decimal.valueOf(csvRecordData[GDP_Number]) : 0.00;
- DataSplicing(GDP_Amount,key_shengfen + '_GDP',Provincial_Goal_Setting_InputMap1,GIassistant,csvRecordData);
-
+ //fy 淇敼 20220412
+ if(JianDangfalg){
+ Decimal GDP_Amount = String.isNotBlank(csvRecordData[GDP_Number]) ? Decimal.valueOf(csvRecordData[GDP_Number]) : 0.00;
+ DataSplicing(GDP_Amount,key_shengfen + '_GDP',Provincial_Goal_Setting_InputMap1,GIassistant,csvRecordData);
+ }
+ //fy 淇敼 20220412
Decimal GI_Amount = String.isNotBlank(csvRecordData[GI_Number]) ? Decimal.valueof(csvRecordData[GI_Number]) : 0.00;
DataSplicing(GI_Amount,key_shengfen + '_GI',Provincial_Goal_Setting_InputMap1,GIassistant,csvRecordData);
@@ -436,15 +548,27 @@
Decimal GYN_Amount = String.isNotBlank(csvRecordData[GYN_Number]) ? Decimal.valueOf(csvRecordData[GYN_Number]) : 0.00;
DataSplicing(GYN_Amount,key_shengfen + '_GYN',Provincial_Goal_Setting_InputMap1,SPassistant,csvRecordData);
-
+
Decimal ENT_Amount = String.isNotBlank(csvRecordData[ENT_Number]) ? Decimal.valueOf(csvRecordData[ENT_Number]) : 0.00;
DataSplicing(ENT_Amount,key_shengfen + '_ENT',Provincial_Goal_Setting_InputMap1,SPassistant,csvRecordData);
- system.debug('ENG_Number--->'+csvRecordData[ENG_Number]);
- //鍥犱负鏈�鍚庝竴鍒楁暟鎹湁绌烘牸锛屾墍浠ュ姞.trim()
- Decimal ENG_Amount = String.isNotBlank(csvRecordData[ENG_Number]) ? Decimal.valueOf(csvRecordData[ENG_Number].trim()) : 0.00;
- // Decimal.valueOf(String str)
- DataSplicing(ENG_Amount,key_shengfen + '_ENG',Provincial_Goal_Setting_InputMap1,SPassistant,csvRecordData);
+ //鍥犱负鏈�鍚庝竴鍒楁暟鎹湁绌烘牸锛屾墍浠ュ姞.trim()
+
+
+ //DB202305277681 fy 20230517 start
+ // Decimal ENG_Amount = String.isNotBlank(csvRecordData[ENG_Number]) ? Decimal.valueOf(csvRecordData[ENG_Number].trim()) : 0.00;
+ // // Decimal.valueOf(String str)
+ // DataSplicing(ENG_Amount,key_shengfen + '_ENG',Provincial_Goal_Setting_InputMap1,SPassistant,csvRecordData);
+ system.debug('ENG1_Number--->'+csvRecordData[ENG1_Number]);
+ Decimal ENG1_Amount = String.isNotBlank(csvRecordData[ENG1_Number]) ? Decimal.valueOf(csvRecordData[ENG1_Number]) : 0.00;
+ DataSplicing(ENG1_Amount,key_shengfen + '_ENG1',Provincial_Goal_Setting_InputMap1,SPassistant,csvRecordData);
+
+ system.debug('ENG2_Number--->'+csvRecordData[ENG2_Number]);
+
+ Decimal ENG2_Amount = String.isNotBlank(csvRecordData[ENG2_Number]) ? Decimal.valueOf(csvRecordData[ENG2_Number].trim()) : 0.00;
+ DataSplicing(ENG2_Amount,key_shengfen + '_ENG2',Provincial_Goal_Setting_InputMap1,SPassistant,csvRecordData);
+
+ //DB202305277681 fy 20230517 end
//鎷兼帴Key
}
if(null!=upsertPGSIList && upsertPGSIList.size()>0){
@@ -562,6 +686,11 @@
// 鏁版嵁璧嬪��
private void setBean(Integer year) {
+ if(JianDangfalg){
+ //DB202305277681 fy 20230517 start
+ amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG1','ENG2'};
+ //DB202305277681 fy 20230517 end
+ }
// 鍙栧緱褰撳墠骞村害鐩爣鏁版嵁
Opportunity[] opportunitys = [select
Id, OwnerId, Opportunity_Category__c, Proportion__c, CloseDate,
@@ -589,7 +718,7 @@
//20210225 ljh WLIG-BV8CHF update 璐㈠勾 end
isPast = false;
if (iYear < currentYear) {
- isPast = true;
+ isPast = true;
} else if (iYear == currentYear) {
if (Date.today().month() == 3) {
isPast = true;
@@ -624,6 +753,7 @@
// 2020/12/28 涓庢棦鏈変腑闂磋〃鏁版嵁杩涜瀵规瘮 fy by ld end
dataBeans.add(dataBean);
}
+ system.debug('dataBeans+++='+dataBeans);
}
//鑾峰彇鏈儴-鐪佸搴斿叧绯�
@@ -648,6 +778,11 @@
provinceList.add('瀹佸鑷不鍖�');
provinceList.add('鐢樿們鐪�');
provinceList.add('鏂扮枂鑷不鍖�');
+ provinceList.add('鍥涘窛鐪�');
+ provinceList.add('閲嶅簡甯�');
+ provinceList.add('浜戝崡鐪�');
+ provinceList.add('璐靛窞鐪�');
+ provinceList.add('瑗胯棌鑷不鍖�');
provinceList.add('涓婃捣甯�');
provinceList.add('姹熻嫃鐪�');
provinceList.add('娴欐睙鐪�');
@@ -660,11 +795,7 @@
provinceList.add('婀栧寳鐪�');
provinceList.add('婀栧崡鐪�');
provinceList.add('娣卞湷甯�');
- provinceList.add('鍥涘窛鐪�');
- provinceList.add('閲嶅簡甯�');
- provinceList.add('浜戝崡鐪�');
- provinceList.add('璐靛窞鐪�');
- provinceList.add('瑗胯棌鑷不鍖�');
+
AllOwnerSystem = provinceList;
salesDptMap.put('0.鏃�',provinceList);
@@ -693,6 +824,18 @@
provinceList.add('鐢樿們鐪�');
provinceList.add('鏂扮枂鑷不鍖�');
salesDptMap.put('3.瑗垮寳',provinceList);
+
+
+ provinceList = new List<String>();
+ provinceList.add('鍥涘窛鐪�');
+ provinceList.add('閲嶅簡甯�');
+ provinceList.add('浜戝崡鐪�');
+ provinceList.add('璐靛窞鐪�');
+ provinceList.add('瑗胯棌鑷不鍖�');
+ // DB202305259561 fy 20230517 start
+ // salesDptMap.put('6.瑗垮崡',provinceList);
+ salesDptMap.put('4.瑗垮崡',provinceList);
+ // DB202305259561 fy 20230517 end
provinceList = new List<String>();
provinceList.add('涓婃捣甯�');
@@ -701,7 +844,10 @@
provinceList.add('绂忓缓鐪�');
provinceList.add('瀹夊窘鐪�');
provinceList.add('姹熻タ鐪�');
- salesDptMap.put('4.鍗庝笢',provinceList);
+ // DB202305259561 fy 20230517 start
+ // salesDptMap.put('4.鍗庝笢',provinceList);
+ salesDptMap.put('5.鍗庝笢',provinceList);
+ // DB202305259561 fy 20230517 end
provinceList = new List<String>();
provinceList.add('骞夸笢鐪�');
@@ -710,15 +856,11 @@
provinceList.add('婀栧寳鐪�');
provinceList.add('婀栧崡鐪�');
provinceList.add('娣卞湷甯�');
- salesDptMap.put('5.鍗庡崡',provinceList);
+ // DB202305259561 fy 20230517 start
+ // salesDptMap.put('5.鍗庡崡',provinceList);
+ salesDptMap.put('6.鍗庡崡',provinceList);
+ // DB202305259561 fy 20230517 end
- provinceList = new List<String>();
- provinceList.add('鍥涘窛鐪�');
- provinceList.add('閲嶅簡甯�');
- provinceList.add('浜戝崡鐪�');
- provinceList.add('璐靛窞鐪�');
- provinceList.add('瑗胯棌鑷不鍖�');
- salesDptMap.put('6.瑗垮崡',provinceList);
provinceMap = new Map<string,string>();
@@ -741,26 +883,49 @@
provinceMap.put('瀹佸鑷不鍖�','3.瑗垮寳');
provinceMap.put('鐢樿們鐪�','3.瑗垮寳');
provinceMap.put('鏂扮枂鑷不鍖�','3.瑗垮寳');
+
+ // DB202305259561 fy 20230517 start
+ // provinceMap.put('涓婃捣甯�','4.鍗庝笢');
+ // provinceMap.put('姹熻嫃鐪�','4.鍗庝笢');
+ // provinceMap.put('娴欐睙鐪�','4.鍗庝笢');
+ // provinceMap.put('绂忓缓鐪�','4.鍗庝笢');
+ // provinceMap.put('瀹夊窘鐪�','4.鍗庝笢');
+ // provinceMap.put('姹熻タ鐪�','4.鍗庝笢');
- provinceMap.put('涓婃捣甯�','4.鍗庝笢');
- provinceMap.put('姹熻嫃鐪�','4.鍗庝笢');
- provinceMap.put('娴欐睙鐪�','4.鍗庝笢');
- provinceMap.put('绂忓缓鐪�','4.鍗庝笢');
- provinceMap.put('瀹夊窘鐪�','4.鍗庝笢');
- provinceMap.put('姹熻タ鐪�','4.鍗庝笢');
+ // provinceMap.put('骞夸笢鐪�','5.鍗庡崡');
+ // provinceMap.put('骞胯タ鑷不鍖�','5.鍗庡崡');
+ // provinceMap.put('娴峰崡鐪�','5.鍗庡崡');
+ // provinceMap.put('婀栧寳鐪�','5.鍗庡崡');
+ // provinceMap.put('婀栧崡鐪�','5.鍗庡崡');
+ // provinceMap.put('娣卞湷甯�','5.鍗庡崡');
- provinceMap.put('骞夸笢鐪�','5.鍗庡崡');
- provinceMap.put('骞胯タ鑷不鍖�','5.鍗庡崡');
- provinceMap.put('娴峰崡鐪�','5.鍗庡崡');
- provinceMap.put('婀栧寳鐪�','5.鍗庡崡');
- provinceMap.put('婀栧崡鐪�','5.鍗庡崡');
- provinceMap.put('娣卞湷甯�','5.鍗庡崡');
+ // provinceMap.put('鍥涘窛鐪�','6.瑗垮崡');
+ // provinceMap.put('閲嶅簡甯�','6.瑗垮崡');
+ // provinceMap.put('浜戝崡鐪�','6.瑗垮崡');
+ // provinceMap.put('璐靛窞鐪�','6.瑗垮崡');
+ // provinceMap.put('瑗胯棌鑷不鍖�','6.瑗垮崡');
+
+ provinceMap.put('鍥涘窛鐪�','4.瑗垮崡');
+ provinceMap.put('閲嶅簡甯�','4.瑗垮崡');
+ provinceMap.put('浜戝崡鐪�','4.瑗垮崡');
+ provinceMap.put('璐靛窞鐪�','4.瑗垮崡');
+ provinceMap.put('瑗胯棌鑷不鍖�','4.瑗垮崡');
+
+ provinceMap.put('涓婃捣甯�','5.鍗庝笢');
+ provinceMap.put('姹熻嫃鐪�','5.鍗庝笢');
+ provinceMap.put('娴欐睙鐪�','5.鍗庝笢');
+ provinceMap.put('绂忓缓鐪�','5.鍗庝笢');
+ provinceMap.put('瀹夊窘鐪�','5.鍗庝笢');
+ provinceMap.put('姹熻タ鐪�','5.鍗庝笢');
- provinceMap.put('鍥涘窛鐪�','6.瑗垮崡');
- provinceMap.put('閲嶅簡甯�','6.瑗垮崡');
- provinceMap.put('浜戝崡鐪�','6.瑗垮崡');
- provinceMap.put('璐靛窞鐪�','6.瑗垮崡');
- provinceMap.put('瑗胯棌鑷不鍖�','6.瑗垮崡');
+ provinceMap.put('骞夸笢鐪�','6.鍗庡崡');
+ provinceMap.put('骞胯タ鑷不鍖�','6.鍗庡崡');
+ provinceMap.put('娴峰崡鐪�','6.鍗庡崡');
+ provinceMap.put('婀栧寳鐪�','6.鍗庡崡');
+ provinceMap.put('婀栧崡鐪�','6.鍗庡崡');
+ provinceMap.put('娣卞湷甯�','6.鍗庡崡');
+
+ // DB202305259561 fy 20230517 end
}
// 鏄惁鍒犻櫎鏁磋鏁版嵁
@@ -933,7 +1098,10 @@
List<OCM_Management_Province__c> OCM_MpList = [select Id,Province__c,GI_assistant__c,SP_assistant__c,Name from OCM_Management_Province__c where Province__c in :AllOwnerSystem ];
for ( OCM_Management_Province__c OCM_Mp : OCM_MpList ) {
//杩囨护鎺変笉绗﹀悎鏉′欢鐨勬暟鎹� fy
- if(OCM_Mp.Name!='闆嗛噰璇�'&&OCM_Mp.Name!='闈掑矝'){
+ // 20230329 ljh start
+ // if(OCM_Mp.Name!='闆嗛噰璇�'&&OCM_Mp.Name!='闈掑矝'){
+ if(OCM_Mp.Name!='闆嗛噰璇�'){
+ // 20230329 ljh end
OCM_MpMap.put(OCM_Mp.Province__c, OCM_Mp);
}
}
@@ -942,6 +1110,7 @@
system.debug('=====UpdateBtn-1');
boolean rs = saveLogic();
setBean(iYear);
+ system.debug('rs+++'+rs);
Database.executeBatch(new SetProvinceTargetBatch(), 10);
if (rs) {
ApexPages.addMessage(new ApexPages.Message(ApexPages.Severity.INFO, '鍙嶆槧鍒扮洰鏍囨垚鍔�'));
@@ -988,7 +1157,15 @@
private Boolean saveLogic() {
List<Opportunity> saveList = new List<Opportunity>();
List<Opportunity> deleteList = new List<Opportunity>();
-
+ //fy 淇敼 20220412
+ system.debug('JianDangfalg+++'+JianDangfalg);
+ if(JianDangfalg){
+ //DB202305277681 fy 20230517 start
+ // amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};
+ amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG1','ENG2'};
+ //DB202305277681 fy 20230517 end
+ }
+ //fy 淇敼 20220412
Savepoint sp = Database.setSavepoint();
try {
List<Provincial_Goal_Setting_Input__c> InsertProvincial_Goal_Setting_Input = new list<Provincial_Goal_Setting_Input__c>();
@@ -1096,12 +1273,33 @@
//CHAN-BDQBLX 20210129 you end
// 鏋勯�犳柟娉�
DataBean(String salesDpt, String province, Map<String, Opportunity> oppMap, Integer iYear) {
+ boolean JianDangfalg = false;
this.opportunity = new Opportunity();
this.amount = new List<Opportunity>();
this.opportunity.SAP_Province__c = province;
this.department = salesDpt;
this.isChanged = '0';
-
+ //fy 20220418
+ String userProfileId = UserInfo.getProfileId();
+ if(!String.isBlank(userProfileId)){
+ userProfileId=userProfileId.substring(0,15);
+ }
+ System.debug('褰撳墠鐢ㄦ埛绠�妗ｆ埅鍙�: '+userProfileId);
+ List<String> user6IdList = System.Label.s6_ID.split(',');
+ for(String user6id : user6IdList){
+ if(user6id==userProfileId){
+ // if(user6id=='00e10000000xnpR'){
+ JianDangfalg=true;
+ break;
+ }
+ }
+ if(JianDangfalg){
+ //DB202305277681 fy 20230517 start
+ // amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};
+ amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG1','ENG2'};
+ //DB202305277681 fy 20230517 end
+ }
+ //fy 20220418
// 鎸夐噾棰濆垎绫伙紝鏌ユ壘鏁版嵁锛屽苟璁惧��
for (Integer i = 0; i < amountCategory.size(); i++) {
String amountC = amountCategory[i];
--
Gitblit v1.9.1