增加获取当前登录用户名功能，增加送返修工单excel文件读取功能。

代码/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.cpp

@@ -67,13 +67,13 @@ void LoadCarDealerSchemeFromXlsx( const wstring &           filePath,
 		const wstring && isQualified   = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex + 8, true );
 
 		//空行跳过
-		if (carDealerCode.empty() == true)
+		if ( carDealerCode.empty() == true )
 		{
 			rowIndex++;
 
 			continue;
 		}
-		
+
 		CarDealerScheme carDealerScheme( theYear,
 		                                 theMonth,
 		                                 carDealerCode,
@@ -150,10 +150,10 @@ void LoadCarDealerAchievementFromXlsx( const std::wstring &                fileP
 		if ( carDealerCode.empty() == true )
 		{
 			rowIndex++;
-			
+
 			continue;
 		}
-		
+
 		//每个字段都要先判断数据类型再读写，防止填写表格的人填错内容。
 		CellType type = pSheet->cellType( rowIndex, firstColumnIndex + 4 );
 		char     errorMessage[1000];
@@ -166,7 +166,7 @@ void LoadCarDealerAchievementFromXlsx( const std::wstring &                fileP
 		else
 		{
 			pBook->release();
-			
+
 			sprintf( errorMessage, "第%d行第%d列，格式错误，不是数字类型！", rowIndex, firstColumnIndex + 4 );
 
 			throw runtime_error( errorMessage );
@@ -182,7 +182,7 @@ void LoadCarDealerAchievementFromXlsx( const std::wstring &                fileP
 		else
 		{
 			pBook->release();
-			
+
 			sprintf( errorMessage, "第%d行第%d列，格式错误，不是数字类型！", rowIndex, firstColumnIndex + 5 );
 
 			throw runtime_error( errorMessage );
@@ -198,7 +198,7 @@ void LoadCarDealerAchievementFromXlsx( const std::wstring &                fileP
 		else
 		{
 			pBook->release();
-			
+
 			sprintf( errorMessage, "第%d行第%d列，格式错误，不是数字类型！", rowIndex, firstColumnIndex + 6 );
 
 			throw runtime_error( errorMessage );
@@ -214,7 +214,7 @@ void LoadCarDealerAchievementFromXlsx( const std::wstring &                fileP
 		else
 		{
 			pBook->release();
-			
+
 			sprintf( errorMessage, "第%d行第%d列，格式错误，不是数字类型！", rowIndex, firstColumnIndex + 7 );
 
 			throw runtime_error( errorMessage );
@@ -230,7 +230,7 @@ void LoadCarDealerAchievementFromXlsx( const std::wstring &                fileP
 		else
 		{
 			pBook->release();
-			
+
 			sprintf( errorMessage, "第%d行第%d列，格式错误，不是数字类型！", rowIndex, firstColumnIndex + 8 );
 
 			throw runtime_error( errorMessage );
@@ -246,7 +246,7 @@ void LoadCarDealerAchievementFromXlsx( const std::wstring &                fileP
 		else
 		{
 			pBook->release();
-			
+
 			sprintf( errorMessage, "第%d行第%d列，格式错误，不是数字类型！", rowIndex, firstColumnIndex + 9 );
 
 			throw runtime_error( errorMessage );
@@ -269,3 +269,229 @@ void LoadCarDealerAchievementFromXlsx( const std::wstring &                fileP
 
 	pBook->release();
 }
+
+void LoadRepairOrderFromXlsx( const std::wstring &       filePath,
+                              unsigned                   sheetIndex,
+                              unsigned                   startRowIndex,
+                              std::vector<RepairOrder> & orderVector )
+{
+	Book *  pBook  = xlCreateXMLBookW();
+	Sheet * pSheet = nullptr;
+
+	if ( pBook == nullptr )
+	{
+		throw runtime_error( "libxl库加载失败！" );
+	}
+
+	setKey( pBook );
+
+	if ( pBook->load( filePath.c_str() ) != true )
+	{
+		string errorMessage = "打开文件失败！";
+		errorMessage.append( pBook->errorMessage() );
+
+		throw runtime_error( errorMessage );
+	}
+
+	pSheet = pBook->getSheet( sheetIndex );
+
+	if ( pSheet == nullptr )
+	{
+		string errorMessage = "读取sheet失败！";
+		errorMessage.append( pBook->errorMessage() );
+
+		pBook->release();
+
+		throw runtime_error( errorMessage );
+	}
+
+	int lastRowIndex  = pSheet->lastRow();
+	int firstRowIndex = pSheet->firstRow();
+	int rowIndex      = firstRowIndex + startRowIndex;
+
+	while ( rowIndex <= lastRowIndex )
+	{
+		int colunmIndex = pSheet->firstCol();
+
+		const wstring && branchName                  = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && orderNo                     = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && orderType                   = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && notifyNo                    = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && damageArea                  = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && damageDate                  = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && generatingDate              = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && policyNo                    = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && policyNoJQX                 = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && plateNumber                 = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && brandName                   = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && isInsuranceObject           = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && isSuccess                   = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && recommandDealerCode         = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && recommandDealerName         = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && recommandDealerCodeInNotify = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && recommandDealerNameInNotify = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && recommandDealerNameInSurvey = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && agentName                   = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && surveyor                    = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && checkDate                   = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && repairingStartDate          = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && repairingFinishDate         = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && status                      = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && lostItemID                  = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && surveyorRecommandStatus     = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+
+		//空行跳过
+		if ( orderNo.empty() == true )
+		{
+			rowIndex++;
+
+			continue;
+		}
+
+		RepairOrder order( branchName,
+		                   orderNo,
+		                   orderType,
+		                   notifyNo,
+		                   damageArea,
+		                   damageDate,
+		                   generatingDate,
+		                   policyNo,
+		                   policyNoJQX,
+		                   plateNumber,
+		                   brandName,
+		                   isInsuranceObject,
+		                   isSuccess,
+		                   recommandDealerCode,
+		                   recommandDealerName,
+		                   recommandDealerCodeInNotify,
+		                   recommandDealerNameInNotify,
+		                   recommandDealerNameInSurvey,
+		                   agentName,
+		                   surveyor,
+		                   checkDate,
+		                   repairingStartDate,
+		                   repairingFinishDate,
+		                   status,
+		                   lostItemID,
+		                   surveyorRecommandStatus );
+
+		orderVector.push_back( order );
+
+		rowIndex++;
+	}
+
+	pBook->release();
+}
+
+void LoadRepairOrderFromXls( const std::wstring &       filePath,
+                             unsigned                   sheetIndex,
+                             unsigned                   startRowIndex,
+                             std::vector<RepairOrder> & orderVector )
+{
+	Book *  pBook  = xlCreateBookW();
+	Sheet * pSheet = nullptr;
+
+	if ( pBook == nullptr )
+	{
+		throw runtime_error( "libxl库加载失败！" );
+	}
+
+	setKey( pBook );
+
+	if ( pBook->load( filePath.c_str() ) != true )
+	{
+		string errorMessage = "打开文件失败！";
+		errorMessage.append( pBook->errorMessage() );
+
+		throw runtime_error( errorMessage );
+	}
+
+	pSheet = pBook->getSheet( sheetIndex );
+
+	if ( pSheet == nullptr )
+	{
+		string errorMessage = "读取sheet失败！";
+		errorMessage.append( pBook->errorMessage() );
+
+		pBook->release();
+
+		throw runtime_error( errorMessage );
+	}
+
+	int lastRowIndex  = pSheet->lastRow();
+	int firstRowIndex = pSheet->firstRow();
+	int rowIndex      = firstRowIndex + startRowIndex;
+
+	while ( rowIndex <= lastRowIndex )
+	{
+		int colunmIndex = pSheet->firstCol();
+
+		const wstring && branchName                  = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && orderNo                     = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && orderType                   = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && notifyNo                    = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && damageArea                  = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && damageDate                  = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && generatingDate              = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && policyNo                    = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && policyNoJQX                 = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && plateNumber                 = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && brandName                   = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && isInsuranceObject           = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && isSuccess                   = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && recommandDealerCode         = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && recommandDealerName         = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && recommandDealerCodeInNotify = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && recommandDealerNameInNotify = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && recommandDealerNameInSurvey = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && agentName                   = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && surveyor                    = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && checkDate                   = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && repairingStartDate          = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && repairingFinishDate         = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && status                      = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && lostItemID                  = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+		const wstring && surveyorRecommandStatus     = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
+
+		//空行跳过
+		if ( orderNo.empty() == true )
+		{
+			rowIndex++;
+
+			continue;
+		}
+
+		RepairOrder order( branchName,
+		                   orderNo,
+		                   orderType,
+		                   notifyNo,
+		                   damageArea,
+		                   damageDate,
+		                   generatingDate,
+		                   policyNo,
+		                   policyNoJQX,
+		                   plateNumber,
+		                   brandName,
+		                   isInsuranceObject,
+		                   isSuccess,
+		                   recommandDealerCode,
+		                   recommandDealerName,
+		                   recommandDealerCodeInNotify,
+		                   recommandDealerNameInNotify,
+		                   recommandDealerNameInSurvey,
+		                   agentName,
+		                   surveyor,
+		                   checkDate,
+		                   repairingStartDate,
+		                   repairingFinishDate,
+		                   status,
+		                   lostItemID,
+		                   surveyorRecommandStatus );
+
+		orderVector.push_back( order );
+
+		rowIndex++;
+	}
+
+	pBook->release();
+}

代码/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.h

@@ -4,6 +4,7 @@
 #include <vector>
 #include "../../Datastructure/CarDealerScheme/CarDealerScheme.h"
 #include "../../Datastructure/CarDealerAchievement/CarDealerAchievement.h"
+#include "../../Datastructure/RepairOrder/RepairOrder.h"
 
 void LoadCarDealerSchemeFromXlsx( const std::wstring &           filePath,
                                   unsigned int                   sheetIndex,
@@ -15,4 +16,14 @@ void LoadCarDealerAchievementFromXlsx( const std::wstring &                fileP
                                        unsigned int                        startRowIndex,
                                        std::vector<CarDealerAchievement> & achievementVector );
 
+void LoadRepairOrderFromXlsx( const std::wstring &       filePath,
+                              unsigned int               sheetIndex,
+                              unsigned int               startRowIndex,
+                              std::vector<RepairOrder> & orderVector );
+
+void LoadRepairOrderFromXls( const std::wstring &       filePath,
+                             unsigned                   sheetIndex,
+                             unsigned                   startRowIndex,
+                             std::vector<RepairOrder> & orderVector );
+
 //void LoadRepairOrderFromXlsx();