diff --git a/code/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.cpp b/code/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.cpp index ba50604..849f4b5 100644 --- a/code/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.cpp +++ b/code/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.cpp @@ -87,6 +87,7 @@ const wchar_t * pwszRepairRecommandationCaption[] = { //新送返修推荐报表 const unsigned int NEW_REPAIR_MONITOR_CAPTION_COUNT = 157; const wchar_t * pwszNewRepairMonitorCaption[] = { + L"分公司名称", L"部门组名称", L"报案号", @@ -181,6 +182,7 @@ const wchar_t * pwszNewRepairMonitorCaption[] = { L"核价修理厂名称", L"估损单号", L"核价通过时间", + L"月份", L"定损员机构", L"定损员代码", L"定损员名称", @@ -801,9 +803,9 @@ void LoadRepairRecommandationFromXlsx( const std::wstring & rowIndex++; continue; } - + RepairRecommandationRecord record( branchName, - orderNo, + orderNo, orderType, notifyNo, RecommandCarDealerCode, @@ -988,6 +990,7 @@ void LoadNewRepairMonitorReportFromXlsx( const std::wstring & record.核价修理厂名称_ = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true ); record.估损单号_ = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true ); record.核价通过时间_ = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true ); + record.月份_ = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true ); record.定损员机构_ = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true ); record.定损员代码_ = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true ); record.定损员名称_ = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true ); diff --git a/code/cpp/car_dealer_util/source/Data/Datastructure/新送返修监控报表/新送返修监控报表.h b/code/cpp/car_dealer_util/source/Data/Datastructure/新送返修监控报表/新送返修监控报表.h index e002f79..313e84c 100644 --- a/code/cpp/car_dealer_util/source/Data/Datastructure/新送返修监控报表/新送返修监控报表.h +++ b/code/cpp/car_dealer_util/source/Data/Datastructure/新送返修监控报表/新送返修监控报表.h @@ -1,4 +1,4 @@ - + #pragma once #include @@ -99,6 +99,7 @@ typedef struct NewRepairMonitorReportRecord_ std::wstring 核价修理厂名称_; std::wstring 估损单号_; std::wstring 核价通过时间_; + std::wstring 月份_; std::wstring 定损员机构_; std::wstring 定损员代码_; std::wstring 定损员名称_;