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/LexSummonsCreatController.cls | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 200 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/classes/LexSummonsCreatController.cls b/force-app/main/default/classes/LexSummonsCreatController.cls
index 9d25889..5f271a4 100644
--- a/force-app/main/default/classes/LexSummonsCreatController.cls
+++ b/force-app/main/default/classes/LexSummonsCreatController.cls
@@ -245,6 +245,7 @@
// 鐢婚潰鍒濆鍖�
@AuraEnabled
+<<<<<<< HEAD
public static ResponseBodyLWC init(
String ESetidJs,
String statusEdit,
@@ -252,6 +253,9 @@
Integer pageTokenLWC,
String arriveorderLWC
) {
+=======
+ public static ResponseBodyLWC init(String ESetidJs, String statusEdit, Integer pageSizeLWC, Integer pageTokenLWC,String arriveorderLWC) {
+>>>>>>> LEXCommunityLiJun
try {
firstInit(ESetidJs);
statusEdit = statusEdit;
@@ -285,6 +289,7 @@
editAble = true;
}
userId = UserInfo.getUserId();
+<<<<<<< HEAD
localuser = [
SELECT id, State_Hospital__c
FROM User
@@ -296,6 +301,11 @@
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;
@@ -313,6 +323,7 @@
];
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
@@ -326,6 +337,13 @@
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 {
@@ -365,6 +383,10 @@
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);
@@ -408,6 +430,10 @@
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) {
@@ -415,6 +441,11 @@
} 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鐨勫悗缂� 鐢ㄤ簬鍖哄垎鍖婚櫌鐗逛环鍜岄潪鍖婚櫌鐗逛环
@@ -759,11 +790,15 @@
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 != '鑽夋涓�'
];
@@ -1323,11 +1358,15 @@
// 鏄剧ず鏁版嵁鏉℃暟淇℃伅
// 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]));
@@ -1424,7 +1463,11 @@
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
}
}
@@ -1441,6 +1484,10 @@
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>();
@@ -1458,6 +1505,10 @@
GROUP BY Category5_text__c
];
+<<<<<<< HEAD
+=======
+ System.debug('category5List ' + category5List);
+>>>>>>> LEXCommunityLiJun
category5OptionList = new List<SelectOption>();
category5OptionList.add(new SelectOption('', '-鏃�-'));
category5OptionMap = new Map<String, String>();
@@ -1489,6 +1540,10 @@
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>();
@@ -1506,6 +1561,10 @@
GROUP BY Category5_text__c
];
+<<<<<<< HEAD
+=======
+ System.debug('category5List ' + category5List);
+>>>>>>> LEXCommunityLiJun
category5OptionList = new List<SelectOption>();
category5OptionList.add(new SelectOption('', '-鏃�-'));
category5OptionMap = new Map<String, String>();
@@ -1573,6 +1632,11 @@
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')));
}
@@ -2085,11 +2149,15 @@
//鐗逛环鍖婚櫌鍑哄簱闈炴湰鍖婚櫌缁存姢鐨勭壒浠峰晢鍝佹椂,鎶ラ敊 闈炵壒浠峰尰闄㈠嚭搴撶淮鎶ゅ湪鍖婚櫌鐗逛环鍏崇郴琛ㄧ殑浜у搧鏃� 鎶ラ敊
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>();
//缁忛攢鍟嗕笅鐨勬墍鏈夌壒浠蜂骇鍝�
@@ -2156,7 +2224,15 @@
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
''
);
}
@@ -2213,10 +2289,14 @@
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 (
@@ -2248,7 +2328,13 @@
return new ResponseBodyLWC(
'Error',
500,
+<<<<<<< HEAD
'娑堣�楀搧' + ass.orderdetails1.Consumable_Product__r.Name__c + '搴撳瓨涓嶈冻',
+=======
+ '娑堣�楀搧' +
+ ass.orderdetails1.Consumable_Product__r.Name__c +
+ '搴撳瓨涓嶈冻',
+>>>>>>> LEXCommunityLiJun
''
);
}
@@ -2264,7 +2350,13 @@
return new ResponseBodyLWC(
'Error',
500,
+<<<<<<< HEAD
'娑堣�楀搧' + ass.orderdetails1.Consumable_Product__r.Name__c + '搴撳瓨涓嶈冻',
+=======
+ '娑堣�楀搧' +
+ ass.orderdetails1.Consumable_Product__r.Name__c +
+ '搴撳瓨涓嶈冻',
+>>>>>>> LEXCommunityLiJun
''
);
}
@@ -2275,11 +2367,15 @@
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) {
@@ -2374,10 +2470,14 @@
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 (
@@ -2403,7 +2503,13 @@
return new ResponseBodyLWC(
'Error',
500,
+<<<<<<< HEAD
'娑堣�楀搧' + ass.orderdetails1.Consumable_Product__r.Name__c + '搴撳瓨涓嶈冻',
+=======
+ '娑堣�楀搧' +
+ ass.orderdetails1.Consumable_Product__r.Name__c +
+ '搴撳瓨涓嶈冻',
+>>>>>>> LEXCommunityLiJun
''
);
}
@@ -2418,7 +2524,13 @@
return new ResponseBodyLWC(
'Error',
500,
+<<<<<<< HEAD
'娑堣�楀搧' + ass.orderdetails1.Consumable_Product__r.Name__c + '搴撳瓨涓嶈冻',
+=======
+ '娑堣�楀搧' +
+ ass.orderdetails1.Consumable_Product__r.Name__c +
+ '搴撳瓨涓嶈冻',
+>>>>>>> LEXCommunityLiJun
''
);
}
@@ -2436,6 +2548,10 @@
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;
@@ -2454,11 +2570,15 @@
}
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;
}
@@ -2570,7 +2690,11 @@
// FROM Account
// WHERE
// // Name = '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�'
+<<<<<<< HEAD
// // AND
+=======
+ // // AND
+>>>>>>> LEXCommunityLiJun
// Name LIKE :nameCondition
// AND RecordType.DeveloperName = 'AgencyContract'
// AND Contract_Decide_Start_Date__c >= :thisDatetime
@@ -2586,7 +2710,11 @@
// FROM Account
// WHERE
// // Name = '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�'
+<<<<<<< HEAD
// // AND
+=======
+ // // AND
+>>>>>>> LEXCommunityLiJun
// Name LIKE :nameCondition
// AND RecordType.DeveloperName = 'AgencyContract'
// AND Contract_Decide_Start_Date__c >= :thisDatetime
@@ -2597,6 +2725,10 @@
// ];
// }
+<<<<<<< HEAD
+=======
+
+>>>>>>> LEXCommunityLiJun
Date today = Date.today();
//Date today = Date.newInstance(2023, 3, 1);
Integer thisMonth = today.month();
@@ -2605,7 +2737,11 @@
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);
@@ -2615,6 +2751,7 @@
System.debug('thisDatetime2 = ' + thisDatetime2);
System.debug('nextDatetime = ' + nextDatetime);
System.debug('UserInfo.getUserId() = ' + UserInfo.getUserId());
+<<<<<<< HEAD
User UserProTypecTemp = [
SELECT UserPro_Type__c
FROM User
@@ -2627,6 +2764,16 @@
} 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') {
@@ -2714,11 +2861,38 @@
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) {
+ List<String> documentIds = new List<String>();
+ for (ContentDocumentLink link : links) {
+ documentIds.add(link.ContentDocumentId);
+ }
+ List<ContentVersion> cvInfo = [
+ SELECT Id, Title, OwnerId, Owner.Name, CreatedDate, ContentDocumentId
+ FROM ContentVersion
+ WHERE ContentDocumentId IN :documentIds
+ ];
+
+ if (cvInfo.size() > 0) {
+ for (Integer i = 0; i < cvInfo.size(); i++) {
+ cvList.add(cvInfo[i]);
+ }
+ }
+ }
+ // List<ContentVersion> cvList = [
+ // SELECT id, Title, CreatedBy.Name, PathOnClient, CreatedDate, ContentDocumentId
+ // FROM ContentVersion
+ // WHERE FirstPublishLocationId = :recordId
+ // ];
+>>>>>>> LEXCommunityLiJun
data.put('cvList', cvList);
res.status = 'Success';
res.code = 200;
@@ -2728,6 +2902,7 @@
//鍒犻櫎闄勪欢
@AuraEnabled
+<<<<<<< HEAD
public static ResponseBodyLWC deleteAtt(String contentVersionId) {
try {
ContentVersion conVersion = [
@@ -2745,6 +2920,17 @@
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
}
}
@@ -2805,11 +2991,15 @@
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;
@@ -2915,8 +3105,14 @@
hospitalSpecialOffer = false;
hosPro = false;
}
+<<<<<<< HEAD
//闄勪欢
+=======
+
+ //闄勪欢
+ @TestVisible
+>>>>>>> LEXCommunityLiJun
public ConsumableorderdetailsInfo(Attachment e) {
concc = e;
hospitalSpecialOffer = false;
@@ -3045,4 +3241,8 @@
@AuraEnabled
public Integer recordEnd { get; set; }
}
+<<<<<<< HEAD
}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1