做了一些修改
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
#include "LoadFromExcel.h"
|
||||
#include "../../excel/excel.h"
|
||||
#include "../../Data/Datastructure/CarDealer/CarDealerMap.h"
|
||||
#include "../../Datastructure/RepairSuggestion/RepairRecommandationRecord.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace libxl;
|
||||
@@ -418,10 +419,10 @@ void LoadRepairOrderFromXlsx( const std::wstring & filePath,
|
||||
pBook->release();
|
||||
}
|
||||
|
||||
void LoadRepairSuggestionFromXlsx( const std::wstring & filePath,
|
||||
void LoadRepairRecommandationFromXlsx( const std::wstring & filePath,
|
||||
unsigned sheetIndex,
|
||||
unsigned startRowIndex,
|
||||
std::vector<RepairSuggestionRecord> & recordVector )
|
||||
std::vector<RepairRecommandationRecord> & recordVector )
|
||||
{
|
||||
Book * pBook = xlCreateXMLBookW();
|
||||
Sheet * pSheet = nullptr;
|
||||
@@ -474,7 +475,7 @@ void LoadRepairSuggestionFromXlsx( const std::wstring & filePat
|
||||
wstring messageSendingDate = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
|
||||
wstring dataSource = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
|
||||
|
||||
RepairSuggestionRecord record( orderNo,
|
||||
RepairRecommandationRecord record( orderNo,
|
||||
orderType,
|
||||
notifyNo,
|
||||
suggestedCarDealerCode,
|
||||
|
@@ -5,7 +5,7 @@
|
||||
#include "../../Datastructure/CarDealerScheme/CarDealerScheme.h"
|
||||
#include "../../Datastructure/CarDealerAchievement/CarDealerAchievement.h"
|
||||
#include "../../Datastructure/RepairOrder/RepairOrder.h"
|
||||
#include "../../Datastructure/RepairSuggestion/RepairSuggestionRecord.h"
|
||||
#include "../../Datastructure/RepairSuggestion/RepairRecommandationRecord.h"
|
||||
#include "../../Datastructure/新送返修监控报表/新送返修监控报表.h"
|
||||
|
||||
/************************************************
|
||||
@@ -56,10 +56,10 @@ void LoadRepairOrderFromXlsx( const std::wstring & filePath,
|
||||
* \param startRowIndex
|
||||
* \param recordVector
|
||||
************************************************/
|
||||
void LoadRepairSuggestionFromXlsx( const std::wstring & filePath,
|
||||
unsigned int sheetIndex,
|
||||
unsigned int startRowIndex,
|
||||
std::vector<RepairSuggestionRecord> & recordVector );
|
||||
void LoadRepairRecommandationFromXlsx( const std::wstring & filePath,
|
||||
unsigned int sheetIndex,
|
||||
unsigned int startRowIndex,
|
||||
std::vector<RepairRecommandationRecord> & recordVector );
|
||||
|
||||
|
||||
/************************************************
|
||||
|
@@ -0,0 +1,2 @@
|
||||
|
||||
#include "RepairRecommandationRecord.h"
|
@@ -6,20 +6,20 @@
|
||||
/************************************************
|
||||
* \brief 送返修推荐表记录
|
||||
************************************************/
|
||||
class RepairSuggestionRecord
|
||||
class RepairRecommandationRecord
|
||||
{
|
||||
public:
|
||||
RepairSuggestionRecord( std::wstring orderNo,
|
||||
std::wstring orderType,
|
||||
std::wstring notifyNo,
|
||||
std::wstring suggestedCarDealerCode,
|
||||
std::wstring suggestedCarDealerName,
|
||||
std::wstring damageDate,
|
||||
std::wstring plateNumber,
|
||||
std::wstring brandName,
|
||||
std::wstring messageType,
|
||||
std::wstring messageSendingDate,
|
||||
std::wstring dataSource )
|
||||
RepairRecommandationRecord( std::wstring orderNo,
|
||||
std::wstring orderType,
|
||||
std::wstring notifyNo,
|
||||
std::wstring suggestedCarDealerCode,
|
||||
std::wstring suggestedCarDealerName,
|
||||
std::wstring damageDate,
|
||||
std::wstring plateNumber,
|
||||
std::wstring brandName,
|
||||
std::wstring messageType,
|
||||
std::wstring messageSendingDate,
|
||||
std::wstring dataSource )
|
||||
: orderNo_( std::move( orderNo ) ),
|
||||
orderType_( std::move( orderType ) ),
|
||||
notifyNo_( std::move( notifyNo ) ),
|
||||
@@ -34,7 +34,7 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
RepairSuggestionRecord( const RepairSuggestionRecord & other )
|
||||
RepairRecommandationRecord( const RepairRecommandationRecord & other )
|
||||
: orderNo_( other.orderNo_ ),
|
||||
orderType_( other.orderType_ ),
|
||||
notifyNo_( other.notifyNo_ ),
|
||||
@@ -49,7 +49,7 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
RepairSuggestionRecord( RepairSuggestionRecord && other )
|
||||
RepairRecommandationRecord( RepairRecommandationRecord && other )
|
||||
: orderNo_( std::move( other.orderNo_ ) ),
|
||||
orderType_( std::move( other.orderType_ ) ),
|
||||
notifyNo_( std::move( other.notifyNo_ ) ),
|
||||
@@ -64,7 +64,7 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
RepairSuggestionRecord & operator=( const RepairSuggestionRecord & other )
|
||||
RepairRecommandationRecord & operator=( const RepairRecommandationRecord & other )
|
||||
{
|
||||
if ( this == &other )
|
||||
return *this;
|
||||
@@ -82,7 +82,7 @@ public:
|
||||
return *this;
|
||||
}
|
||||
|
||||
RepairSuggestionRecord & operator=( RepairSuggestionRecord && other )
|
||||
RepairRecommandationRecord & operator=( RepairRecommandationRecord && other )
|
||||
{
|
||||
if ( this == &other )
|
||||
return *this;
|
Reference in New Issue
Block a user