From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/classes/DealerInquiryModifyStateController.cls | 281 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 281 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/classes/DealerInquiryModifyStateController.cls b/force-app/main/default/classes/DealerInquiryModifyStateController.cls
index d46bcca..b24dbd3 100644
--- a/force-app/main/default/classes/DealerInquiryModifyStateController.cls
+++ b/force-app/main/default/classes/DealerInquiryModifyStateController.cls
@@ -1,23 +1,38 @@
public with sharing class DealerInquiryModifyStateController {
public List<OpportunityInfo> oppRecords { get; set; }
// 銉氥兗銈搞儸銈ゃ偄銈︺儓銇儏鍫便倰鍙栧緱
+<<<<<<< HEAD
private Map<String, Map<String, String>> editLayoutItemRWMap = new Map<String, Map<String, String>>();
+=======
+ private Map<String, Map<String, String>> editLayoutItemRWMap = New Map<String, Map<String, String>>();
+>>>>>>> LEXCommunityLiJun
// private Map<String, Map<String, String>> editLayoutItemRWMapRt = null;
public List<OpportunityInfo> OPPORTList { get; set; }
/*****************妞滅储鐢�******************/
/*******************妫�绱㈠睘鎬у��*******************/
+<<<<<<< HEAD
public String accSearch { get; set; } //缁忛攢鍟嗗尰闄�
public String aooSearch { get; set; } //鎷呭綋浜�
public String numtext1 { get; set; } //鏁版嵁瀛楁01
public String numtext { get; set; } //鏁版嵁瀛楁03
+=======
+ public String accSearch { get; set; }//缁忛攢鍟嗗尰闄�
+ public String aooSearch { get; set; }//鎷呭綋浜�
+ public String numtext1 { get; set; } //鏁版嵁瀛楁01
+ public String numtext { get; set; }//鏁版嵁瀛楁03
+>>>>>>> LEXCommunityLiJun
public String numtext2 { get; set; } //鏁版嵁瀛楁02
public String timetext1 { get; set; } //鏃ユ湡01
public String timetext2 { get; set; } //鏃ユ湡02
public Agency_Opportunity__c tmpAO { get; set; } //妫�绱㈡棩鏈熺敤
public Agency_Opportunity__c tmpBO { get; set; } //妫�绱㈡棩鏈熺敤
+<<<<<<< HEAD
public String limits { get; set; } //鏃ユ湡03
+=======
+ public String limits { get; set; }//鏃ユ湡03
+>>>>>>> LEXCommunityLiJun
public List<SelectOption> dateOpts { get; private set; }
public List<SelectOption> textOpts { get; private set; }
@@ -34,28 +49,49 @@
public String preSortKey { get; set; }
public Boolean sortOrderAsc { get; set; }
public String[] sortOrder { get; set; }
+<<<<<<< HEAD
public String[] columus = new List<String>{ 'Id' };
public String[] selColumus = null;
public Set<String> columusSet = new Set<String>{ 'Id' };
+=======
+ public String[] columus = new String[] {'Id'};
+ public String[] selColumus = null;
+ public Set<String> columusSet = new Set<String> {'Id'};
+>>>>>>> LEXCommunityLiJun
// 椤圭洰set 瀛楁鏍囩
public List<String> titleLeft { get; private set; }
public List<String> titleRight { get; private set; }
// 椤圭洰set 瀛楁鍚�
+<<<<<<< HEAD
public List<List<String>> columnsLeftApi { get; private set; } // 鍙傜収闋呯洰鐢�
public List<List<String>> columnsRightApi { get; private set; } // 鍙傜収闋呯洰鐢�
public List<String> columnLeftCss { get; private set; } // css 鐢�
public List<String> columnRightCss { get; private set; } // css 鐢�
public Map<String, String> columnLeftRW { get; private set; } // r,w,wm鐢�
public Map<String, String> columnRightRW { get; private set; } // r,w,wm鐢�
+=======
+ public List<List<String>> columnsLeftApi { get; private set; } // 鍙傜収闋呯洰鐢�
+ public List<List<String>> columnsRightApi { get; private set; } // 鍙傜収闋呯洰鐢�
+ public List<String> columnLeftCss { get; private set; } // css 鐢�
+ public List<String> columnRightCss { get; private set; } // css 鐢�
+ public Map<String, String> columnLeftRW { get; private set; } // r,w,wm鐢�
+ public Map<String, String> columnRightRW { get; private set; } // r,w,wm鐢�
+>>>>>>> LEXCommunityLiJun
private String strColumus;
private String strRtColumus;
//add by Link 2023-6-2
+<<<<<<< HEAD
public String remindMsg { get; set; }
@TestVisible
private String accTypeForSort = null;
+=======
+ public String remindMsg{get;set;}
+
+ @TestVisible private String accTypeForSort = null;
+>>>>>>> LEXCommunityLiJun
private static Integer oppLimit = 500;
public DealerInquiryModifyStateController() {
@@ -83,6 +119,7 @@
textOpts.add(new SelectOption('Oly_Inquiry_Stage__c', 'Oly璇环闃舵'));
//绮剧悽绉戞妧 zxk 2021-08-25 end
textOpts.add(new SelectOption('Hospital_City_Master__c', '甯�'));
+<<<<<<< HEAD
// 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', '鐪�'));
@@ -127,6 +164,52 @@
limits = '20';
}
+=======
+
+ // 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('', '--鏃�--'));
+ timeOpts.add(new SelectOption('Created_Day__c', '鍒涘缓鏃�'));
+ timeOpts.add(new SelectOption('Bid_Planned_Date__c', '棰勬祴鎷涙爣鏃�'));
+ timeOpts.add(new SelectOption('Forecasted_Bid_Date__c', '棰勬祴涓爣鏃�'));
+ timeOpts.add(new SelectOption('Close_Forecasted_Date__c', '棰勬祴涓嶰LY绛剧害鏃�'));
+ timeOpts.add(new SelectOption('Lost_Opportunity_Date__c', '澶卞崟鏃ユ湡'));
+ timeOpts.add(new SelectOption('Deleted_Reason_Date__c', '鍙栨秷鏃ユ湡'));
+ //鏁版嵁瀛楁涓棿杩炴帴绗﹀彿
+ equalOpts = new List<SelectOption>();
+ equalOpts.add(new SelectOption('=', '绛変簬'));
+ equalOpts.add(new SelectOption('<>', '涓嶇瓑浜�'));
+ equalOpts.add(new SelectOption('<', '<'));
+ equalOpts.add(new SelectOption('>', '>'));
+ equalOpts.add(new SelectOption('<=', '<='));
+ equalOpts.add(new SelectOption('>=', '>='));
+ equalOpts.add(new SelectOption('contains', '鍖呭惈'));
+ equalOpts.add(new SelectOption('notcontains', '涓嶅寘鍚�'));
+ equalOpts.add(new SelectOption('starts with', '璧峰瀛楃'));
+ //鏃ユ湡瀛楁杩炴帴绗﹀彿
+ //timeequalOpts = new List<SelectOption>();
+ //timeequalOpts.add(new SelectOption('=', '绛変簬'));
+ //timeequalOpts.add(new SelectOption('<>', '涓嶇瓑浜�'));
+ //timeequalOpts.add(new SelectOption('<', '<'));
+ //timeequalOpts.add(new SelectOption('>', '>'));
+ //timeequalOpts.add(new SelectOption('<=', '<='));
+ //timeequalOpts.add(new SelectOption('>=', '>='));
+ //鏁版嵁鏄剧ず鏉℃暟
+ limitOpts = new List<SelectOption>();
+ limitOpts.add(new SelectOption('10', '10'));
+ 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', '鍏ㄩ儴'));
+ //鏁版嵁鏄剧ず榛樿鏉℃暟
+ limits = '20';
+ }
+
+>>>>>>> LEXCommunityLiJun
public PageReference init() {
remindMsg = '';
PartnerSoapSforceCom.Soap soap = new PartnerSoapSforceCom.Soap();
@@ -160,7 +243,11 @@
layoutItem.layoutComponents.add(layoutComponent);
// return dlr;
} else {
+<<<<<<< HEAD
dlr = soap.describeLayout('Agency_Opportunity__c', null, null);
+=======
+ dlr = soap.describeLayout('Agency_Opportunity__c', null, null);
+>>>>>>> LEXCommunityLiJun
// dlr = soap.describeLayout('asdas', null, null);
}
@@ -178,11 +265,16 @@
for (PartnerSoapSforceCom.DescribeLayoutSection section : layout.editLayoutSections) {
for (PartnerSoapSforceCom.DescribeLayoutRow row : section.layoutRows) {
for (PartnerSoapSforceCom.DescribeLayoutItem item : row.layoutItems) {
+<<<<<<< HEAD
if (
item.layoutComponents != null &&
item.layoutComponents.size() > 0 &&
String.isBlank(item.layoutComponents[0].value) == false
) {
+=======
+ if (item.layoutComponents != null && item.layoutComponents.size() > 0
+ && String.isBlank(item.layoutComponents[0].value) == false) {
+>>>>>>> LEXCommunityLiJun
rtnInner.put(item.layoutComponents[0].value, 'r');
if (item.editableForUpdate) {
rtnInner.put(item.layoutComponents[0].value, 'w');
@@ -203,10 +295,16 @@
return null;
}
//鐢ㄤ簬鑾峰彇缁忛攢鍟嗚浠峰瓧娈甸泦鍜岃浠峰瓧娈甸泦浠ュ強鐩稿簲鐨勮鍐欐潈闄�
+<<<<<<< HEAD
@TestVisible
private void setLayoutRWInfo() {
if (this.sortOrder == null) {
selColumus = new List<String>{};
+=======
+ @TestVisible private void setLayoutRWInfo() {
+ if (this.sortOrder == null) {
+ selColumus = new String[] {};
+>>>>>>> LEXCommunityLiJun
strColumus = '';
ID accRecordTypeId = accTypeForSort;
@@ -285,14 +383,23 @@
strRtColumus = strRtColumus + ',' + s;
}
columnRightCss.add(s.replace('.', '_'));
+<<<<<<< HEAD
+=======
+
+>>>>>>> LEXCommunityLiJun
}
strColumus = String.join(columus, ',');
System.debug('======-======-======strColumus' + strColumus);
System.debug('======-======-======strRtColumus' + strRtColumus);
this.sortOrderAsc = true;
+<<<<<<< HEAD
this.sortOrder = new List<String>(selColumus.size());
for (Integer i = 0; i < selColumus.size(); i++)
this.sortOrder[i] = '銆�';
+=======
+ this.sortOrder = new String[selColumus.size()];
+ for (Integer i = 0; i < selColumus.size(); i++) this.sortOrder[i] = '銆�';
+>>>>>>> LEXCommunityLiJun
}
}
//鐢ㄤ簬鎷兼帴SOQL璇彞 鏍规嵁涓嶅悓妫�绱㈡潯浠舵嫾鎺ヤ笉鍚孲OQL璇彞銆�
@@ -314,17 +421,27 @@
// System.debug('pppqqq333'+querySoql);
// AND Ownerid in ( '+querySoql+')'
+<<<<<<< HEAD
String soql =
'SELECT Change_To_Opportunity__r.Id , Agency_Hospital__r.Name , Product_Category1__r.Name , Product_Category2__r.Name , Product_Category3__r.Name , Agency_Person__r.Name , Agency__r.Name , Change_To_Opportunity__r.Name ,' +
strColumus +
',' +
strRtColumus +
' FROM Agency_Opportunity__c WHERE recordType.DeveloperName = \'Opportunity\' ';
+=======
+ String soql = 'SELECT Change_To_Opportunity__r.Id , Agency_Hospital__r.Name , Product_Category1__r.Name , Product_Category2__r.Name , Product_Category3__r.Name , Agency_Person__r.Name , Agency__r.Name , Change_To_Opportunity__r.Name ,' +
+ strColumus + ',' + strRtColumus +
+ ' FROM Agency_Opportunity__c WHERE recordType.DeveloperName = \'Opportunity\' ';
+>>>>>>> LEXCommunityLiJun
//鏁版嵁瀛楁锛氱粡閿�鍟嗗尰闄� +SOQL
if (!String.isBlank(accSearch)) {
accSearch = accSearch.trim();
// soql += 'AND Agency__r.Name ' + ' LIKE \'%' + accSearch + '%\' ';
+<<<<<<< HEAD
soql += 'AND Agency_Hospital__r.Name ' + ' LIKE \'%' + accSearch + '%\' ';
+=======
+ soql += 'AND Agency_Hospital__r.Name ' + ' LIKE \'%' + accSearch + '%\' ';
+>>>>>>> LEXCommunityLiJun
}
//鏁版嵁瀛楁锛氭媴褰撲汉 +SOQL
if (!String.isBlank(aooSearch)) {
@@ -335,7 +452,11 @@
//鏁版嵁瀛楁锛�03 鎵嬪姩濉啓椤� 鍑嗗璋冪敤makeTextSql锛�
if (!String.isBlank(numtext)) {
String newNumtext = numtext.trim();
+<<<<<<< HEAD
String str = makeTextSql(numtext1, numtext2, newNumtext);
+=======
+ String str = makeTextSql(numtext1, numtext2, newNumtext);
+>>>>>>> LEXCommunityLiJun
soql += str;
System.debug('+++++++++++++=============++++++++++++++++++' + soql);
}
@@ -345,6 +466,7 @@
soql += ' order by LastModifiedDate desc limit ' + Integer.valueOf(limits);
} else {
if (Integer.valueOf(this.sortKey) <= titleLeft.size() + 7) {
+<<<<<<< HEAD
soql +=
' order by ' +
this.selColumus[Integer.valueOf(this.sortKey)] +
@@ -360,6 +482,11 @@
(this.sortOrderAsc == true ? 'asc nulls first' : 'desc nulls last') +
' limit ' +
Integer.valueOf(limits);
+=======
+ soql += ' order by ' + this.selColumus[Integer.valueOf(this.sortKey)] + ' ' + (this.sortOrderAsc == true ? 'asc nulls first' : 'desc nulls last') + ' limit ' + Integer.valueOf(limits);
+ } else {
+ soql += ' order by Change_To_Opportunity__r.' + this.selColumus[Integer.valueOf(this.sortKey)] + ' ' + (this.sortOrderAsc == true ? 'asc nulls first' : 'desc nulls last') + ' limit ' + Integer.valueOf(limits);
+>>>>>>> LEXCommunityLiJun
}
}
system.debug(soql);
@@ -367,7 +494,11 @@
// System.debug('pppqqq111'+userlist1);
List<Agency_Opportunity__c> InfoList = Database.query(soql);
+<<<<<<< HEAD
System.debug('+++++++-------------------' + InfoList);
+=======
+ System.debug('+++++++-------------------'+InfoList);
+>>>>>>> LEXCommunityLiJun
// List<Agency_Opportunity__c> InfoList = ControllerUtil.DatabaseQuery(soql);
// System.debug('InfoList[0].Change_To_Opportunity_T__c'+InfoList[0].Change_To_Opportunity_T__c);
@@ -383,6 +514,10 @@
str = '\'' + agc.Change_To_Opportunity__r.Id + '\'';
} else if (agc.Change_To_Opportunity__r.Id != null) {
str += ',\'' + agc.Change_To_Opportunity__r.Id + '\'';
+<<<<<<< HEAD
+=======
+
+>>>>>>> LEXCommunityLiJun
}
}
for (Agency_Opportunity__c info : InfoList) {
@@ -399,9 +534,13 @@
remindMsg = '鍙栧緱鏈�杩戠殑 ' + oppCount + ' 鏉℃暟鎹�';
} else if (!String.isBlank(this.sortKey)) {
if (oppCount > oppLimit) {
+<<<<<<< HEAD
ApexPages.addmessage(
new ApexPages.message(ApexPages.severity.INFO, '鏁版嵁瓒呰繃' + oppLimit + '浠讹紝鍙樉绀哄墠' + oppLimit + '浠�')
);
+=======
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '鏁版嵁瓒呰繃' + oppLimit + '浠讹紝鍙樉绀哄墠' + oppLimit + '浠�'));
+>>>>>>> LEXCommunityLiJun
//add by Link 2023-6-2
remindMsg = '鏁版嵁瓒呰繃' + oppLimit + '浠讹紝鍙樉绀哄墠' + oppLimit + '浠�';
} else {
@@ -428,12 +567,22 @@
String cSql = '';
soql += ' AND (';
for (Integer icount = 0; icount < vals.size(); icount++) {
+<<<<<<< HEAD
//绮剧悽绉戞妧 zxk 2021-08-25 start
String val = vals[icount];
if (equalOpts == 'contains') {
cSql = this.makeTextSqlStr(textOpts, equalOpts, val);
soql += cSql;
+=======
+
+ //绮剧悽绉戞妧 zxk 2021-08-25 start
+ String val = vals[icount];
+ if (equalOpts == 'contains') {
+ cSql = this.makeTextSqlStr(textOpts, equalOpts, val);
+ soql += cSql;
+
+>>>>>>> LEXCommunityLiJun
if (icount < vals.size() - 1) {
soql += ' OR ';
}
@@ -444,9 +593,17 @@
soql += ' AND ';
}
}
+<<<<<<< HEAD
}
//绮剧悽绉戞妧 zxk 2021-08-25 end
+=======
+
+ }
+ //绮剧悽绉戞妧 zxk 2021-08-25 end
+
+
+>>>>>>> LEXCommunityLiJun
// String val = vals[icount];
// cSql = this.makeTextSqlStr(textOpts, equalOpts, val);
// system.debug(cSql);
@@ -489,6 +646,10 @@
else if (equalOpts == '=' || equalOpts == '<>') {
soql += 'AND ' + textOpts + equalOpts + '\'' + numtext + '\'';
}
+<<<<<<< HEAD
+=======
+
+>>>>>>> LEXCommunityLiJun
//绮剧悽绉戞妧 zxk 2021-08-25 start
//璧峰瀛楃
else if (equalOpts == 'starts with' && numtext.contains(' ')) {
@@ -497,13 +658,24 @@
for (Integer icount = 0; icount < vals.size(); icount++) {
String val = vals[icount];
if (equalOpts == 'starts with') {
+<<<<<<< HEAD
soql += ' ' + textOpts + ' LIKE \'%' + val + '%\'';
if (icount < vals.size() - 1) {
soql += ' OR ';
+=======
+ soql += ' ' + textOpts + ' LIKE \'%' + val + '%\'' ;
+ if (icount < vals.size() - 1) {
+ soql += ' OR ';
+
+>>>>>>> LEXCommunityLiJun
}
}
}
soql += ')';
+<<<<<<< HEAD
+=======
+
+>>>>>>> LEXCommunityLiJun
}
//绮剧悽绉戞妧 zxk 2021-08-25 end
@@ -524,14 +696,19 @@
return soql;
}
//妫�绱㈡潯浠讹細鏁版嵁瀛楁1锛屾暟鎹瓧娈�2锛屾暟鎹瓧娈�3鍧囨弧瓒筹紝骞朵笖杩涘叆makeTextSql锛堬級涔嬪悗锛屽唴鍚暟鎹瓧娈靛寘鍚绉嶆椂杩涘叆姝ゆ柟娉曘��
+<<<<<<< HEAD
@TestVisible
private String makeTextSqlStr(String textOpts, String equalOpts, String val) {
+=======
+ @TestVisible private String makeTextSqlStr(String textOpts, String equalOpts, String val) {
+>>>>>>> LEXCommunityLiJun
String soql = '';
if (!String.isBlank(textOpts)) {
String tmpVal = val;
if (!String.isBlank(tmpVal)) {
if (equalOpts == 'contains' || equalOpts == 'notcontains') {
if (equalOpts == 'contains') {
+<<<<<<< HEAD
soql += ' ' + textOpts + ' LIKE \'%' + val + '%\'';
} else if (equalOpts == 'notcontains') {
soql += ' ( NOT ' + textOpts + ' LIKE \'%' + val + '%\' ) ';
@@ -541,6 +718,17 @@
soql += ' AND ' + textOpts + ' = ' + val;
} else if (equalOpts == '<>') {
soql += ' AND ' + textOpts + ' <> ' + val;
+=======
+ soql += ' ' + textOpts + ' LIKE \'%' + val + '%\'' ;
+ } else if (equalOpts == 'notcontains') {
+ soql += ' ( NOT ' + textOpts + ' LIKE \'%' + val + '%\' ) ' ;
+ }
+ } else if (equalOpts == '=' || equalOpts == '<>') {
+ if (equalOpts == '=') {
+ soql += ' AND ' + textOpts + ' = ' + val ;
+ } else if (equalOpts == '<>') {
+ soql += ' AND ' + textOpts + ' <> ' + val ;
+>>>>>>> LEXCommunityLiJun
}
}
} else {
@@ -568,6 +756,7 @@
setLayoutRWInfo();
searchOppInner();
return null;
+<<<<<<< HEAD
}
//椤甸潰鍐呭鏈変慨鏀规椂锛岄〉闈㈠垽鏂悗浼犲�肩粰changeFlg浠ュ強changeFlgRt灞炴�э紝鐐瑰嚮淇濆瓨鏃惰皟鐢ㄦ鏂规硶锛岃繘琛屼繚瀛樸��
public PageReference save() {
@@ -657,3 +846,95 @@
}
}
}
+=======
+ }
+ //椤甸潰鍐呭鏈変慨鏀规椂锛岄〉闈㈠垽鏂悗浼犲�肩粰changeFlg浠ュ強changeFlgRt灞炴�э紝鐐瑰嚮淇濆瓨鏃惰皟鐢ㄦ鏂规硶锛岃繘琛屼繚瀛樸��
+ public PageReference save() {
+ //system.debug('oppRecords[1].opp:' + oppRecords[1].opp +' oppRecords[1].AgcOpp:' + oppRecords[1].AgcOpp );
+ try {
+ List<Agency_Opportunity__c> updTarget = new List<Agency_Opportunity__c>();
+ // List<Opportunity> updOpps = new List<Opportunity>();
+ for (OpportunityInfo oi : oppRecords) {
+ if (oi.changeFlg == '1') {
+ oi.changeFlg = '0';
+ updTarget.add(oi.AgcOpp);
+
+ }
+ // if (oi.changeFlgRt == '1' && oi.opp.id != null) {
+ // oi.changeFlgRt = '0';
+ // updOpps.add(oi.opp);
+ // }
+ }
+ if (updTarget.size() > 0) {
+ system.debug('updTarget.size:' + updTarget.size() );
+ update updTarget;
+ }
+ // if (updOpps.size() > 0) {
+ // update updOpps;
+ // }
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '淇濆瓨瀹屼簡'));
+ //add by Link 2023-6-2
+ remindMsg = '淇濆瓨瀹屼簡';
+ } catch (Exception e) {
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇风‘瀹氱瀹ゅ垎绫诲拰浜у搧鍖哄垎鐨勫叧绯�'));
+ }
+ if (saveType == '1') {
+ searchOppInner();
+ saveType = '';
+ } else if (saveType == '2') {
+ sortTable();
+ saveType = '';
+ } else {
+ }
+ return null;
+ }
+ //鍏ㄩ儴灞曞紑璋冪敤姝ゆ柟娉�
+ public PageReference sortTable() {
+ oppRecords = new List<OpportunityInfo>();
+ if (this.sortKey == this.preSortKey) {
+ if (String.isBlank(this.sortKey) == false) {
+ // 鏂瑰悜銇屽銈忋倠銇伩
+ this.sortOrderAsc = !this.sortOrderAsc;
+ this.sortOrder[Integer.valueOf(this.sortKey)] = (this.sortOrderAsc == true ? '鈫�' : '鈫�');
+ }
+ } else {
+ this.sortOrderAsc = true;
+ if (String.isBlank(this.preSortKey) == false) {
+ this.sortOrder[Integer.valueOf(this.preSortKey)] = '銆�';
+ }
+ this.sortOrder[Integer.valueOf(this.sortKey)] = (this.sortOrderAsc == true ? '鈫�' : '鈫�');
+ }
+ this.preSortKey = this.sortKey;
+
+ setLayoutRWInfo();
+ searchOppInner();
+ return null;
+ }
+
+ //鑷畾涔夌被OpportunityInfo锛岀敤浜庡垱寤鸿櫄鎷熷瓧娈碉紝鍚堝苟杈撳嚭銆�
+ class OpportunityInfo {
+ // public Opportunity opp { get; set; }
+ public Agency_Opportunity__c opp { get; set; }
+ public Boolean canEdit { get; private set; }
+ public Boolean hasError { get; private set; }
+ public Boolean hasFieldError { get; private set; }
+ public Integer lineNo { get; private set; }
+ public String changeFlg { get; set; }
+ public String changeFlgRt { get; set; }
+ public Boolean ifLock { get; set; }
+ //public String accType { get; private set; }
+ public Agency_Opportunity__c AgcOpp { get; set; }
+ public OpportunityInfo(Agency_Opportunity__c record, Agency_Opportunity__c oppo) {
+ opp = oppo;
+ canEdit = true;
+ hasError = false;
+ hasFieldError = false;
+ lineNo = 0;
+ changeFlg = '0';
+ changeFlgRt = '0';
+ ifLock = Approval.isLocked(record);
+ AgcOpp = record;
+ }
+ }
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1