OlyMEBG.git - Gitblit

			@@ -69,6 +69,10 @@
			// CHAN-C9P5WM 20211216 ssm 增加科室名 start
			public String DepartmentName;
			// CHAN-C9P5WM 20211216 ssm 增加科室名 end


			public String winBiddingDate;//SWAG-CCL6R7 2022-3-22 yjk 增加中标日

			}

			public class Detail_element {
			@@ -221,6 +225,11 @@
			// CHAN-C9P5WM 20211216 ssm 增加科室名 start
			Department_Name__c,
			// CHAN-C9P5WM 20211216 ssm 增加科室名 end

			//SWAG-CCL6R7 2022-3-22 yjk 增加中标日 start
			Closing_Bid_Date_Bid__c,
			Closing_Bid_Date__c,
			//SWAG-CCL6R7 2022-3-22 yjk 增加中标日 end
			Account.RecordType.DeveloperName

			from Opportunity
			@@ -475,6 +484,9 @@
			quotation.DepartmentName = opp.Department_Name__c;
			// CHAN-C9P5WM 20211216 ssm 增加科室名 end

			//SWAG-CCL6R7 2022-3-22 yjk 增加中标日 start
			quotation.winBiddingDate = opp.Closing_Bid_Date_Bid__c ==null? NFMUtil.formatDate2Str(opp.Closing_Bid_Date__c) : NFMUtil.formatDate2Str(opp.Closing_Bid_Date_Bid__c);
			//SWAG-CCL6R7 2022-3-22 yjk 增加中标日 end
			// 产品
			List<OpportunityLineItem> oppLineList = oppIDMap.get(opp.id);
			quotation.Items = new List<Detail_element>();

			@@ -165,7 +165,7 @@
			opportunityInfo.Contract_DB_request_reason__c = gda.Contract_DB_request_reason;
			opportunityInfo.Contract_DB_complite_day__c = NFMUtil.parseStr2Date(gda.Contract_DB_complite_day);
			opportunityInfo.Assistant_Applied_Date__c = NFMUtil.parseStr2Date(gda.Assistant_Applied_Date);
			opportunityInfo.Closing_Bid_Date__c = NFMUtil.parseStr2Date(gda.Closing_Bid_Date);
			//opportunityInfo.Closing_Bid_Date__c = NFMUtil.parseStr2Date(gda.Closing_Bid_Date); //SWAG-CCL6R7 2022-3-22 yjk 注释掉中标日逻辑
			opportunityInfo.Contract_DB_SalesDept_complite_day__c = NFMUtil.parseStr2Date(gda.Contract_DB_SalesDept_complite_day);
			opportunityInfo.Contract_Invalid_Date__c = null;
			opportunityInfo.Contract_Authorize_Lock__c = true;

	force-app/main/default/classes/NFM202Controller.cls	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	force-app/main/default/classes/NFM206Rest.cls	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史