From 559771a80cf779dc13a84ecd2f178e6ca5a8353a Mon Sep 17 00:00:00 2001
From: FUYU <fuyu@prec-tech.com>
Date: 星期五, 19 五月 2023 15:52:16 +0800
Subject: [PATCH] 备份省目标录入
---
force-app/main/default/classes/SetProvinceTargetBatch.cls | 35 +++++-
force-app/main/default/classes/SetProvinceTargetController.cls | 234 ++++++++++++++++++++++++++++++++++------------
force-app/main/default/pages/SetProvinceTarget.page | 21 +++-
force-app/main/default/classes/SetProvinceTargetControllerTest.cls | 2
4 files changed, 216 insertions(+), 76 deletions(-)
diff --git a/force-app/main/default/classes/SetProvinceTargetBatch.cls b/force-app/main/default/classes/SetProvinceTargetBatch.cls
index b29db8e..aa788fc 100644
--- a/force-app/main/default/classes/SetProvinceTargetBatch.cls
+++ b/force-app/main/default/classes/SetProvinceTargetBatch.cls
@@ -197,14 +197,35 @@
}
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
}
//鍒濆鍖栨棦瀛樼洰鏍囨暟鎹�
oppMap = new Map<String, Opportunity>();
diff --git a/force-app/main/default/classes/SetProvinceTargetController.cls b/force-app/main/default/classes/SetProvinceTargetController.cls
index 028d11c..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,11 +62,17 @@
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銆�
- private static String[] amountCategory = new String[] {'GI','ET','BF','GS','URO','GYN','ENT','ENG'};
+ //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'};
//SWAG-C9YDDE 2021/12/28 fy end
@@ -72,7 +83,10 @@
public String users6_ID = System.Label.s6_ID;
public boolean JianDangfalg { get; set; }
//fy 淇敼 end
- private static String[] titlepage = new String[] {'閿�鍞湰閮�', '鐪�','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};
+ //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'};
//SWAG-C9YDDE 2021/12/28 fy end
@@ -103,8 +117,12 @@
System.debug('user6IdList: '+user6IdList);
System.debug('JianDangfalg: '+JianDangfalg);
if(JianDangfalg){
- amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};
- titlepage = new String[] {'閿�鍞湰閮�', '鐪�','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};
+ //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
@@ -207,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) {
@@ -337,7 +373,10 @@
public PageReference importCSVFile() {
try{
if(JianDangfalg){
- titlepage = new String[] {'閿�鍞湰閮�', '鐪�','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};
+ //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');
// 灏嗗唴瀹硅浆鎹㈡垚涓轰腑鏂�
@@ -416,7 +455,11 @@
Integer URO_Number = 0;
Integer GYN_Number = 0;
Integer ENT_Number = 0;
- Integer ENG_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;
@@ -428,7 +471,11 @@
URO_Number = 7;
GYN_Number = 8;
ENT_Number = 9;
- ENG_Number = 10;
+ //DB202305277681 fy 20230517 start
+ // ENG_Number = 10;
+ ENG1_Number = 10;
+ ENG2_Number = 11;
+ //DB202305277681 fy 20230517 end
}else{
GI_Number = 2;
ET_Number = 3;
@@ -437,7 +484,11 @@
URO_Number = 6;
GYN_Number = 7;
ENT_Number = 8;
- ENG_Number = 9;
+ //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()) {
@@ -497,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);
- system.debug('ENG_Number--->'+csvRecordData[ENG_Number]);
+
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){
@@ -624,7 +687,9 @@
// 鏁版嵁璧嬪��
private void setBean(Integer year) {
if(JianDangfalg){
- amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};
+ //DB202305277681 fy 20230517 start
+ amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG1','ENG2'};
+ //DB202305277681 fy 20230517 end
}
// 鍙栧緱褰撳墠骞村害鐩爣鏁版嵁
Opportunity[] opportunitys = [select
@@ -653,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;
@@ -713,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('娴欐睙鐪�');
@@ -725,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);
@@ -758,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('涓婃捣甯�');
@@ -766,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('骞夸笢鐪�');
@@ -775,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>();
@@ -806,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
}
// 鏄惁鍒犻櫎鏁磋鏁版嵁
@@ -998,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);
}
}
@@ -1055,8 +1158,12 @@
List<Opportunity> saveList = new List<Opportunity>();
List<Opportunity> deleteList = new List<Opportunity>();
//fy 淇敼 20220412
+ system.debug('JianDangfalg+++'+JianDangfalg);
if(JianDangfalg){
- amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};
+ //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();
@@ -1187,7 +1294,10 @@
}
}
if(JianDangfalg){
- amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};
+ //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
// 鎸夐噾棰濆垎绫伙紝鏌ユ壘鏁版嵁锛屽苟璁惧��
diff --git a/force-app/main/default/classes/SetProvinceTargetControllerTest.cls b/force-app/main/default/classes/SetProvinceTargetControllerTest.cls
index 3462fbb..696ff28 100644
--- a/force-app/main/default/classes/SetProvinceTargetControllerTest.cls
+++ b/force-app/main/default/classes/SetProvinceTargetControllerTest.cls
@@ -536,7 +536,7 @@
sptc.searchByDpt();
//瀵煎嚭
sptc.exportBycsv();
- sptc.csvAsString = '閿�鍞湰閮�,鐪�,GDP,GI,ET,BF,GS,URO,GYN,ENT,ENG\n5.鍗庝笢,涓婃捣甯�,100,2000,2345,123,1200,400,500,40,55';
+ sptc.csvAsString = '閿�鍞湰閮�,鐪�,GDP,GI,ET,BF,GS,URO,GYN,ENT,ENG1,ENG2\n5.鍗庝笢,涓婃捣甯�,100,2000,2345,123,1200,400,500,40,55,3';
//test read csv file
sptc.importCSVFile();
diff --git a/force-app/main/default/pages/SetProvinceTarget.page b/force-app/main/default/pages/SetProvinceTarget.page
index dcd8e4d..85fbdc4 100644
--- a/force-app/main/default/pages/SetProvinceTarget.page
+++ b/force-app/main/default/pages/SetProvinceTarget.page
@@ -1,4 +1,4 @@
-<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetProvinceTargetController" action="{!init}">
+<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetProvinceTargetController" action="{!init}" lightningStylesheets="true">
<head>
<title>鍚勭渷鐩爣璁惧畾</title>
@@ -44,7 +44,10 @@
function calc() {
debugger;
- var JianDangfalg3 =j$(escapeVfId('Page:Form:editBlock:JianDangfalg')).value();
+ // DB202305259561 fy 20230517 start
+ // var JianDangfalg3 =j$(escapeVfId('Page:Form:editBlock:JianDangfalg')).value();
+ var JianDangfalg3 = '{!JianDangfalg}';
+ // DB202305259561 fy 20230517 end
// alert('sss= '+s);
var isorgtbl = j$('div[name=bodyTable]');
var tbl = document.getElementById('MainTable');
@@ -54,12 +57,15 @@
datarows -= 2;
}
var allSum = 0;
- var cols = [0, 0, 0, 0, 0, 0, 0, 0];
+ //DB202305277681 fy 20230517 start
+ // var cols = [0, 0, 0, 0, 0, 0, 0, 0];
+ var cols = [0, 0, 0, 0, 0, 0, 0, 0, 0];
+ //DB202305277681 fy 20230517 end
// 琛�
for (var i = 0; i < datarows; i++) {
var rowSum = 0;
// 鍒�
- for (var j = 0; j < 8; j++) {
+ for (var j = 0; j < 9; j++) {
var amount = 0;
var x=j;
if(JianDangfalg3=='true'){
@@ -78,7 +84,7 @@
}
// 鍒�
- for (var j = 0; j < 8; j++) {
+ for (var j = 0; j < 9; j++) {
j$(escapeVfId('totalcol' + j)).text(toNumComma(cols[j]));
}
// 绶忚▓
@@ -301,7 +307,7 @@
<!-- <td class="dataCell" id="NameHold"></td> -->
<td class="dataCell" style="text-align:center;">鍚堣</td>
<apex:variable value="JianDangfalg" var="JianDangfalg2" rendered="{!IF(JianDangfalg, true, false)}" >
- <td class="dataCell" style="text-align:right;" id="totalcol8"></td>
+ <td class="dataCell" style="text-align:right;" id="totalcol9"></td>
</apex:variable>
<td class="dataCell" style="text-align:right;" id="totalcol0"></td>
<td class="dataCell" style="text-align:right;" id="totalcol1"></td>
@@ -311,6 +317,9 @@
<td class="dataCell" style="text-align:right;" id="totalcol5"></td>
<td class="dataCell" style="text-align:right;" id="totalcol6"></td>
<td class="dataCell" style="text-align:right;" id="totalcol7"></td>
+ <!-- DB202305277681 fy 20230517 start -->
+ <td class="dataCell" style="text-align:right;" id="totalcol8"></td>
+ <!-- DB202305277681 fy 20230517 end -->
<td class="dataCell" style="text-align:right;" id="totalAll"></td>
</tr>
<apex:repeat value="{!dataBeans}" var="dbs" id="dbRepeat">
--
Gitblit v1.9.1