From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/classes/LexSummonsCreatController.cls | 229 +--------------------------------------------------------
1 files changed, 4 insertions(+), 225 deletions(-)
diff --git a/force-app/main/default/classes/LexSummonsCreatController.cls b/force-app/main/default/classes/LexSummonsCreatController.cls
index 5f271a4..598c217 100644
--- a/force-app/main/default/classes/LexSummonsCreatController.cls
+++ b/force-app/main/default/classes/LexSummonsCreatController.cls
@@ -245,7 +245,6 @@
// 鐢婚潰鍒濆鍖�
@AuraEnabled
-<<<<<<< HEAD
public static ResponseBodyLWC init(
String ESetidJs,
String statusEdit,
@@ -253,9 +252,6 @@
Integer pageTokenLWC,
String arriveorderLWC
) {
-=======
- public static ResponseBodyLWC init(String ESetidJs, String statusEdit, Integer pageSizeLWC, Integer pageTokenLWC,String arriveorderLWC) {
->>>>>>> LEXCommunityLiJun
try {
firstInit(ESetidJs);
statusEdit = statusEdit;
@@ -289,23 +285,9 @@
editAble = true;
}
userId = UserInfo.getUserId();
-<<<<<<< HEAD
- localuser = [
- SELECT id, State_Hospital__c
- FROM User
- WHERE id = :UserInfo.getUserId()
- ];
- //userId = '00510000005QO75';
- user Useracc = [
- SELECT accountid, Work_Location__c, UserPro_Type__c
- FROM user
- WHERE id = :userId
- ];
-=======
localuser = [SELECT id, State_Hospital__c FROM User WHERE id = :UserInfo.getUserId()];
//userId = '00510000005QO75';
user Useracc = [SELECT accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :userId];
->>>>>>> LEXCommunityLiJun
accountid = Useracc.accountid;
userWorkLocation = Useracc.Work_Location__c;
agencyProType = Useracc.UserPro_Type__c;
@@ -323,27 +305,11 @@
];
List<Agency_Hospital_Link__c> AgencyHospitalLink = new List<Agency_Hospital_Link__c>();
-<<<<<<< HEAD
- AgencyHospitalLink = [
- SELECT Id, Hospital__c, Hospital__r.Name
- FROM Agency_Hospital_Link__c
- WHERE Agency__c = :accountid
- ];
-
- //add by rentx 2021-3-1 start
- //鍒ゆ柇褰撳墠缁忛攢鍟嗕笅鏄惁鏈夌壒浠峰尰闄�
- List<hospitalprice__c> hlist = [
- SELECT id, product__c
- FROM hospitalprice__c
- WHERE account__c = :accountid
- ];
-=======
AgencyHospitalLink = [SELECT Id, Hospital__c, Hospital__r.Name FROM Agency_Hospital_Link__c WHERE Agency__c = :accountid];
//add by rentx 2021-3-1 start
//鍒ゆ柇褰撳墠缁忛攢鍟嗕笅鏄惁鏈夌壒浠峰尰闄�
List<hospitalprice__c> hlist = [SELECT id, product__c FROM hospitalprice__c WHERE account__c = :accountid];
->>>>>>> LEXCommunityLiJun
if (hlist == null || hlist.size() == 0) {
hasHos = false;
} else {
@@ -383,10 +349,7 @@
for (AggregateResult orderdetail : orderdetailCount) {
zaikuId.add(String.valueOf(orderdetail.get('cpc')));
}
-<<<<<<< HEAD
-=======
System.debug('orderdetailCount = ' + orderdetailCount);
->>>>>>> LEXCommunityLiJun
System.debug('sqlagencyProType = ' + sqlagencyProType);
System.debug('userWorkLocation = ' + userWorkLocation);
System.debug('accountName = ' + accountName);
@@ -430,10 +393,7 @@
for (Integer i = 0; i < product2Selected.size(); i++) {
MidMap.put(product2Selected[i].Id, new ConsumableorderdetailsInfo(product2Selected[i]));
}
-<<<<<<< HEAD
-=======
System.debug('MidMap = ' + MidMap);
->>>>>>> LEXCommunityLiJun
for (Integer i = 0; i < CountDel.size(); i++) {
String str = '';
if (CountDel[i].hospitalSpecialOffer__c) {
@@ -441,11 +401,8 @@
} else {
str = 'notHos';
}
-<<<<<<< HEAD
-=======
System.debug('CountDel[i].Consumable_Product__c= ' + CountDel[i].Consumable_Product__c);
System.debug('CountDel[i].Consumable_Product__c + str= ' + CountDel[i].Consumable_Product__c + str);
->>>>>>> LEXCommunityLiJun
//鏄庣粏2瀵瑰簲鐨勪骇鍝佸瓨鍦ㄤ簬MidMap涓�
if (MidMap.containsKey(CountDel[i].Consumable_Product__c)) {
//璁剧疆map涓璳ey鐨勫悗缂� 鐢ㄤ簬鍖哄垎鍖婚櫌鐗逛环鍜岄潪鍖婚櫌鐗逛环
@@ -790,15 +747,7 @@
SELECT Id, Name, Invoice_Date__c, NoConfirmedPrice__c, Invoice_total_amount__c, Invoice_status__c
FROM Consumable_order__c
WHERE
-<<<<<<< HEAD
- Id IN (
- SELECT Invoice_Code_link__c
- FROM Consumable_order_LinkTable__c
- WHERE Outboundorder_Code_link__c = :ESetId
- )
-=======
Id IN (SELECT Invoice_Code_link__c FROM Consumable_order_LinkTable__c WHERE Outboundorder_Code_link__c = :ESetId)
->>>>>>> LEXCommunityLiJun
AND Invoice_status__c != '鑽夋涓�'
];
@@ -1358,15 +1307,7 @@
// 鏄剧ず鏁版嵁鏉℃暟淇℃伅
// makeMessage();
//闄勪欢
-<<<<<<< HEAD
- attachmentinfo = [
- SELECT Id, Name, OwnerId
- FROM Attachment
- WHERE parentid = :ESetId
- ];
-=======
attachmentinfo = [SELECT Id, Name, OwnerId FROM Attachment WHERE parentid = :ESetId];
->>>>>>> LEXCommunityLiJun
if (attachmentinfo.size() > 0) {
for (Integer i = 0; i < attachmentinfo.size(); i++) {
attachmentRecoeds.add(new ConsumableorderdetailsInfo(attachmentinfo[i]));
@@ -1463,11 +1404,7 @@
System.debug('res = ' + res);
return res;
} catch (Exception e) {
-<<<<<<< HEAD
return new ResponseBodyLWC('Error', 500, e.getMessage() + e.getLineNumber(), '');
-=======
- return new ResponseBodyLWC('Error',500, e.getMessage() + e.getLineNumber(), '');
->>>>>>> LEXCommunityLiJun
}
}
@@ -1484,10 +1421,7 @@
WHERE Category3_text__c = :category3 AND Category4_text__c != NULL AND Category5_text__c != NULL
GROUP BY Category4_text__c
];
-<<<<<<< HEAD
-=======
System.debug('category4List ' + category4List);
->>>>>>> LEXCommunityLiJun
category4OptionList = new List<SelectOption>();
category4OptionList.add(new SelectOption('', '-鏃�-'));
category4OptionMap = new Map<String, String>();
@@ -1505,10 +1439,7 @@
GROUP BY Category5_text__c
];
-<<<<<<< HEAD
-=======
System.debug('category5List ' + category5List);
->>>>>>> LEXCommunityLiJun
category5OptionList = new List<SelectOption>();
category5OptionList.add(new SelectOption('', '-鏃�-'));
category5OptionMap = new Map<String, String>();
@@ -1540,10 +1471,7 @@
WHERE Category3_text__c = :category3 AND Category4_text__c != NULL AND Category5_text__c != NULL
GROUP BY Category4_text__c
];
-<<<<<<< HEAD
-=======
System.debug('category4List ' + category4List);
->>>>>>> LEXCommunityLiJun
category4OptionList = new List<SelectOption>();
category4OptionList.add(new SelectOption('', '-鏃�-'));
category4OptionMap = new Map<String, String>();
@@ -1561,10 +1489,7 @@
GROUP BY Category5_text__c
];
-<<<<<<< HEAD
-=======
System.debug('category5List ' + category5List);
->>>>>>> LEXCommunityLiJun
category5OptionList = new List<SelectOption>();
category5OptionList.add(new SelectOption('', '-鏃�-'));
category5OptionMap = new Map<String, String>();
@@ -1632,11 +1557,8 @@
AND Arrive_Owner_Work_Location__c = :userWorkLocationLwc
GROUP BY Consumable_Product__c, Box_Piece__c
];
-<<<<<<< HEAD
-=======
System.debug('orderdetailCount = ' + orderdetailCount);
->>>>>>> LEXCommunityLiJun
for (AggregateResult orderdetail : orderdetailCount) {
zaikuId.add(String.valueOf(orderdetail.get('cpc')));
}
@@ -2149,15 +2071,7 @@
//鐗逛环鍖婚櫌鍑哄簱闈炴湰鍖婚櫌缁存姢鐨勭壒浠峰晢鍝佹椂,鎶ラ敊 闈炵壒浠峰尰闄㈠嚭搴撶淮鎶ゅ湪鍖婚櫌鐗逛环鍏崇郴琛ㄧ殑浜у搧鏃� 鎶ラ敊
if (coc.SummonsForDirction__c != '浜掔浉璋冭揣') {
//闈炵壒浠峰尰闄㈠嚭搴撶壒浠蜂骇鍝佹椂 鎶ラ敊(褰撳墠缁忛攢鍟嗕笅娌℃湁鐗逛环鍖婚櫌闄ゅ)
-<<<<<<< HEAD
- List<hospitalprice__c> hopList = [
- SELECT id, hospital__c, product__c
- FROM hospitalprice__c
- WHERE account__c = :accountid
- ];
-=======
List<hospitalprice__c> hopList = [SELECT id, hospital__c, product__c FROM hospitalprice__c WHERE account__c = :accountid];
->>>>>>> LEXCommunityLiJun
//缁忛攢鍟嗗搴斿尰闄笅鐨勬墍鏈夌壒浠蜂骇鍝�
Map<String, String> proMap = new Map<String, String>();
//缁忛攢鍟嗕笅鐨勬墍鏈夌壒浠蜂骇鍝�
@@ -2224,15 +2138,7 @@
return new ResponseBodyLWC(
'Error',
500,
-<<<<<<< HEAD
'缁忛攢鍟�:' + coc.Order_ForDealerText__c + ' 娌℃湁娑堣�楀搧:' + proStr.substring(0, proStr.length() - 1) + ' 鐨勭壒浠�',
-=======
- '缁忛攢鍟�:' +
- coc.Order_ForDealerText__c +
- ' 娌℃湁娑堣�楀搧:' +
- proStr.substring(0, proStr.length() - 1) +
- ' 鐨勭壒浠�',
->>>>>>> LEXCommunityLiJun
''
);
}
@@ -2289,14 +2195,10 @@
if (ass.orderdetails1.Delivery_List_RMB__c == null && coc.SummonsForDirction__c != '鍖婚櫌璇曠敤') {
return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)', '');
}
-<<<<<<< HEAD
if (
(ass.orderdetails1.Delivery_List_RMB__c == null || ass.orderdetails1.Delivery_List_RMB__c == 0) &&
coc.SummonsForDirction__c != '鍖婚櫌璇曠敤'
) {
-=======
- if ((ass.orderdetails1.Delivery_List_RMB__c == null || ass.orderdetails1.Delivery_List_RMB__c == 0) && coc.SummonsForDirction__c != '鍖婚櫌璇曠敤') {
->>>>>>> LEXCommunityLiJun
return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)', '');
}
if (
@@ -2328,13 +2230,7 @@
return new ResponseBodyLWC(
'Error',
500,
-<<<<<<< HEAD
'娑堣�楀搧' + ass.orderdetails1.Consumable_Product__r.Name__c + '搴撳瓨涓嶈冻',
-=======
- '娑堣�楀搧' +
- ass.orderdetails1.Consumable_Product__r.Name__c +
- '搴撳瓨涓嶈冻',
->>>>>>> LEXCommunityLiJun
''
);
}
@@ -2350,13 +2246,7 @@
return new ResponseBodyLWC(
'Error',
500,
-<<<<<<< HEAD
'娑堣�楀搧' + ass.orderdetails1.Consumable_Product__r.Name__c + '搴撳瓨涓嶈冻',
-=======
- '娑堣�楀搧' +
- ass.orderdetails1.Consumable_Product__r.Name__c +
- '搴撳瓨涓嶈冻',
->>>>>>> LEXCommunityLiJun
''
);
}
@@ -2367,15 +2257,7 @@
insert p;
ESetId = p.id;
List<Consumable_order__c> detailName = new List<Consumable_order__c>();
-<<<<<<< HEAD
- detailName = [
- SELECT id, Name
- FROM Consumable_order__c
- WHERE id = :ESetId
- ];
-=======
detailName = [SELECT id, Name FROM Consumable_order__c WHERE id = :ESetId];
->>>>>>> LEXCommunityLiJun
Integer i = 1;
for (ConsumableorderdetailsInfoLwc ass : pageRecordsLwc) {
if (ass.check == true) {
@@ -2470,14 +2352,10 @@
return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)', '');
}
Consumable_orderdetails__c InsAfterDel = new Consumable_orderdetails__c();
-<<<<<<< HEAD
if (
(ass.orderdetails1.Delivery_List_RMB__c == null || ass.orderdetails1.Delivery_List_RMB__c == 0) &&
coc.SummonsForDirction__c != '鍖婚櫌璇曠敤'
) {
-=======
- if ((ass.orderdetails1.Delivery_List_RMB__c == null || ass.orderdetails1.Delivery_List_RMB__c == 0) && coc.SummonsForDirction__c != '鍖婚櫌璇曠敤') {
->>>>>>> LEXCommunityLiJun
return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)', '');
}
if (
@@ -2503,13 +2381,7 @@
return new ResponseBodyLWC(
'Error',
500,
-<<<<<<< HEAD
'娑堣�楀搧' + ass.orderdetails1.Consumable_Product__r.Name__c + '搴撳瓨涓嶈冻',
-=======
- '娑堣�楀搧' +
- ass.orderdetails1.Consumable_Product__r.Name__c +
- '搴撳瓨涓嶈冻',
->>>>>>> LEXCommunityLiJun
''
);
}
@@ -2524,13 +2396,7 @@
return new ResponseBodyLWC(
'Error',
500,
-<<<<<<< HEAD
'娑堣�楀搧' + ass.orderdetails1.Consumable_Product__r.Name__c + '搴撳瓨涓嶈冻',
-=======
- '娑堣�楀搧' +
- ass.orderdetails1.Consumable_Product__r.Name__c +
- '搴撳瓨涓嶈冻',
->>>>>>> LEXCommunityLiJun
''
);
}
@@ -2548,10 +2414,7 @@
InsAfterDel.Name = p.name + '-' + str;
InsAfterDel.Shipment_Count__c = ass.orderdetails1.Shipment_Count__c;
InsAfterDel.Consumable_order__c = ESetId;
-<<<<<<< HEAD
-=======
System.debug('ass.Prod.id:' + ass.Prod.id);
->>>>>>> LEXCommunityLiJun
InsAfterDel.Consumable_Product__c = ass.Prod.id;
InsAfterDel.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
InsAfterDel.Delivery_List_RMB__c = ass.orderdetails1.Delivery_List_RMB__c;
@@ -2570,15 +2433,7 @@
}
update p;
List<Consumable_orderdetails__c> qs = new List<Consumable_orderdetails__c>();
-<<<<<<< HEAD
- qs = [
- SELECT Id
- FROM Consumable_orderdetails__c
- WHERE Consumable_order__c = :ESetId
- ];
-=======
qs = [SELECT Id FROM Consumable_orderdetails__c WHERE Consumable_order__c = :ESetId];
->>>>>>> LEXCommunityLiJun
if (qs.size() > 0) {
delete qs;
}
@@ -2690,11 +2545,7 @@
// FROM Account
// WHERE
// // Name = '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�'
-<<<<<<< HEAD
// // AND
-=======
- // // AND
->>>>>>> LEXCommunityLiJun
// Name LIKE :nameCondition
// AND RecordType.DeveloperName = 'AgencyContract'
// AND Contract_Decide_Start_Date__c >= :thisDatetime
@@ -2710,11 +2561,7 @@
// FROM Account
// WHERE
// // Name = '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�'
-<<<<<<< HEAD
// // AND
-=======
- // // AND
->>>>>>> LEXCommunityLiJun
// Name LIKE :nameCondition
// AND RecordType.DeveloperName = 'AgencyContract'
// AND Contract_Decide_Start_Date__c >= :thisDatetime
@@ -2725,10 +2572,6 @@
// ];
// }
-<<<<<<< HEAD
-=======
-
->>>>>>> LEXCommunityLiJun
Date today = Date.today();
//Date today = Date.newInstance(2023, 3, 1);
Integer thisMonth = today.month();
@@ -2737,11 +2580,7 @@
Integer lastYear = today.year() - 1;
Integer thisYear = today.year();
Integer nextYear = today.year() + 1;
-<<<<<<< HEAD
-=======
-
->>>>>>> LEXCommunityLiJun
Date lastDatetime = Date.newInstance(lastYear, 4, 1);
Date thisDatetime = Date.newInstance(thisYear, 4, 1);
Date thisDatetime2 = Date.newInstance(thisYear, 7, 1);
@@ -2751,12 +2590,7 @@
System.debug('thisDatetime2 = ' + thisDatetime2);
System.debug('nextDatetime = ' + nextDatetime);
System.debug('UserInfo.getUserId() = ' + UserInfo.getUserId());
-<<<<<<< HEAD
- User UserProTypecTemp = [
- SELECT UserPro_Type__c
- FROM User
- WHERE id = :UserInfo.getUserId()
- ];
+ User UserProTypecTemp = [SELECT UserPro_Type__c FROM User WHERE id = :UserInfo.getUserId()];
String sql = 'SELECT id, Parentid FROM Account WHERE Parent.Name LIKE :nameCondition ';
if (thisMonth < 4) {
@@ -2764,16 +2598,6 @@
} else if (thisMonth >= 4 && thisMonth <= 6) {
sql += 'AND Contract_Decide_Start_Date__c >= :lastDatetime AND Contract_Decide_End_Date__c < :nextDatetime ';
} else {
-=======
- User UserProTypecTemp = [select UserPro_Type__c from User where id =: UserInfo.getUserId()];
-
- String sql = 'SELECT id, Parentid FROM Account WHERE Parent.Name LIKE :nameCondition ';
- if(thisMonth < 4){
- sql += 'AND Contract_Decide_Start_Date__c >= :lastDatetime AND Contract_Decide_End_Date__c < :thisDatetime2 ';
- }else if(thisMonth >= 4 && thisMonth <= 6){
- sql += 'AND Contract_Decide_Start_Date__c >= :lastDatetime AND Contract_Decide_End_Date__c < :nextDatetime ';
- }else{
->>>>>>> LEXCommunityLiJun
sql += 'AND Contract_Decide_Start_Date__c >= :thisDatetime AND Contract_Decide_End_Date__c < :nextDatetime ';
}
if (UserProTypecTemp.UserPro_Type__c == 'ENG') {
@@ -2861,13 +2685,6 @@
ResponseBodyLWC res = new ResponseBodyLWC();
Map<String, object> data = new Map<String, object>();
res.entity = data;
-<<<<<<< HEAD
- List<ContentVersion> cvList = [
- SELECT id, Title, CreatedBy.Name, PathOnClient, CreatedDate, ContentDocumentId
- FROM ContentVersion
- WHERE FirstPublishLocationId = :recordId
- ];
-=======
List<ContentVersion> cvList = new List<ContentVersion>();
List<ContentDocumentLink> links = [SELECT Id, ContentDocumentId FROM ContentDocumentLink WHERE LinkedEntityId = :recordId];
if (links != null && links.size() > 0) {
@@ -2880,7 +2697,7 @@
FROM ContentVersion
WHERE ContentDocumentId IN :documentIds
];
-
+
if (cvInfo.size() > 0) {
for (Integer i = 0; i < cvInfo.size(); i++) {
cvList.add(cvInfo[i]);
@@ -2892,7 +2709,6 @@
// FROM ContentVersion
// WHERE FirstPublishLocationId = :recordId
// ];
->>>>>>> LEXCommunityLiJun
data.put('cvList', cvList);
res.status = 'Success';
res.code = 200;
@@ -2902,35 +2718,15 @@
//鍒犻櫎闄勪欢
@AuraEnabled
-<<<<<<< HEAD
public static ResponseBodyLWC deleteAtt(String contentVersionId) {
try {
- ContentVersion conVersion = [
- SELECT ContentDocumentId
- FROM ContentVersion
- WHERE Id = :contentVersionId
- ];
+ ContentVersion conVersion = [SELECT ContentDocumentId FROM ContentVersion WHERE Id = :contentVersionId];
String contentDocumentId = conVersion.ContentDocumentId;
- ContentDocument conDocument = [
- SELECT Id
- FROM ContentDocument
- WHERE Id = :contentDocumentId
- ];
+ ContentDocument conDocument = [SELECT Id FROM ContentDocument WHERE Id = :contentDocumentId];
delete conDocument;
return new ResponseBodyLWC('Success', 200, '', '');
} catch (Exception e) {
return new ResponseBodyLWC('Error', 500, e.getMessage() + e.getLineNumber(), '');
-=======
- public static ResponseBodyLWC deleteAtt(String contentVersionId){
- try {
- ContentVersion conVersion = [SELECT ContentDocumentId FROM ContentVersion WHERE Id = :contentVersionId];
- String contentDocumentId = conVersion.ContentDocumentId;
- ContentDocument conDocument = [SELECT Id FROM ContentDocument where Id = :contentDocumentId];
- delete conDocument;
- return new ResponseBodyLWC('Success',200,'','');
- } catch (Exception e) {
- return new ResponseBodyLWC('Error',500, e.getMessage() + e.getLineNumber(), '');
->>>>>>> LEXCommunityLiJun
}
}
@@ -2991,15 +2787,7 @@
try {
List<Consumable_order__c> qs = new List<Consumable_order__c>();
List<Consumable_orderdetails__c> Dqs = new List<Consumable_orderdetails__c>();
-<<<<<<< HEAD
- Dqs = [
- SELECT Id
- FROM Consumable_orderdetails__c
- WHERE Consumable_order__c = :ESetId
- ];
-=======
Dqs = [SELECT Id FROM Consumable_orderdetails__c WHERE Consumable_order__c = :ESetId];
->>>>>>> LEXCommunityLiJun
qs = [SELECT Id FROM Consumable_order__c WHERE Id = :ESetId];
if (Dqs.size() > 0 || qs.size() > 0) {
delete Dqs;
@@ -3105,14 +2893,9 @@
hospitalSpecialOffer = false;
hosPro = false;
}
-<<<<<<< HEAD
//闄勪欢
-=======
-
- //闄勪欢
@TestVisible
->>>>>>> LEXCommunityLiJun
public ConsumableorderdetailsInfo(Attachment e) {
concc = e;
hospitalSpecialOffer = false;
@@ -3241,8 +3024,4 @@
@AuraEnabled
public Integer recordEnd { get; set; }
}
-<<<<<<< HEAD
}
-=======
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1