111

code/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.cpp

@@ -54,7 +54,7 @@ void LoadCarDealerSchemeFromXlsx( const wstring &           filePath,
 	int rowIndex         = firstRowIndex + startRowIndex;
 
 	//车商名称表
-	auto * pCarDealerMap = getCarDealerMap();
+	auto * pCarDealerMap = GetCarDealerMap();
 
 	while ( rowIndex <= lastRowIndex )
 	{
@@ -148,7 +148,7 @@ void LoadCarDealerAchievementFromXlsx( const std::wstring &                fileP
 	int firstColumnIndex = pSheet->firstCol();
 	int rowIndex         = firstRowIndex + startRowIndex;
 
-	unordered_map<wstring, CarDealer>* pCarDealerMap = getCarDealerMap();
+	unordered_map<wstring, CarDealer>* pCarDealerMap = GetCarDealerMap();
 
 	while ( rowIndex <= lastRowIndex )
 	{
@@ -341,7 +341,7 @@ void LoadRepairOrderFromXlsx( const std::wstring &       filePath,
 	int firstRowIndex = pSheet->firstRow();
 	int rowIndex      = firstRowIndex + startRowIndex;
 
-	auto* pCarDealerMap = getCarDealerMap();
+	auto* pCarDealerMap = GetCarDealerMap();
 
 	while ( rowIndex <= lastRowIndex )
 	{

code/cpp/car_dealer_util/source/Data/Datastructure/CarDealer/CarDealer.h

@@ -50,6 +50,27 @@ public:
 		return *this;
 	}
 
+
+	QString getCarDealerCode() const
+	{
+		return carDealerCode;
+	}
+
+	void setCarDealerCode( const QString & carDealerCode )
+	{
+		this->carDealerCode = carDealerCode;
+	}
+
+	QString getCarDealerName() const
+	{
+		return carDealerName;
+	}
+
+	void setCarDealerName( const QString & carDealerName )
+	{
+		this->carDealerName = carDealerName;
+	}
+
 private:
 	QString carDealerCode;
 	QString carDealerName;

code/cpp/car_dealer_util/source/Data/Datastructure/CarDealer/CarDealerMap.cpp

@@ -20,7 +20,7 @@ using namespace ocilib;
 
 unordered_map<wstring, CarDealer> * pCarDealerMap = nullptr;
 
-void initCarDealerMap()
+void InitCarDealerMap()
 {
 	if ( pCarDealerMap != nullptr )
 	{
@@ -187,12 +187,26 @@ void initCarDealerMapCpp()
 	Environment::Cleanup();
 }
 
-std::unordered_map<wstring, CarDealer> * getCarDealerMap()
+std::unordered_map<wstring, CarDealer> * GetCarDealerMap()
 {
 	if ( pCarDealerMap != nullptr )
 	{
-		initCarDealerMap();
+		InitCarDealerMap();
 	}
 
 	return pCarDealerMap;
 }
+
+std::wstring GetCarDealerName( const std::wstring & carDealerCode )
+{
+	auto    pCarDealerMap = GetCarDealerMap();
+	auto    iterCarDealer = pCarDealerMap->find(carDealerCode);
+	wstring carDealerName;
+	
+	if ( iterCarDealer != pCarDealerMap->end() )
+	{
+		carDealerName = iterCarDealer->second.getCarDealerName().toStdWString();
+	}
+
+	return carDealerName;
+}

code/cpp/car_dealer_util/source/Data/Datastructure/CarDealer/CarDealerMap.h

@@ -16,10 +16,12 @@
 /************************************************
 * \brief 
 ************************************************/
-void initCarDealerMap();
+void InitCarDealerMap();
 
 /************************************************
 * \brief 
 * \return 
 ************************************************/
-std::unordered_map<std::wstring, CarDealer> * getCarDealerMap();
+std::unordered_map<std::wstring, CarDealer> * GetCarDealerMap();
+
+std::wstring GetCarDealerName(const std::wstring& carDealerCode);