111
This commit is contained in:
		@@ -54,7 +54,7 @@ void LoadCarDealerSchemeFromXlsx( const wstring &           filePath,
 | 
				
			|||||||
	int rowIndex         = firstRowIndex + startRowIndex;
 | 
						int rowIndex         = firstRowIndex + startRowIndex;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	//车商名称表
 | 
						//车商名称表
 | 
				
			||||||
	auto * pCarDealerMap = getCarDealerMap();
 | 
						auto * pCarDealerMap = GetCarDealerMap();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	while ( rowIndex <= lastRowIndex )
 | 
						while ( rowIndex <= lastRowIndex )
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
@@ -148,7 +148,7 @@ void LoadCarDealerAchievementFromXlsx( const std::wstring &                fileP
 | 
				
			|||||||
	int firstColumnIndex = pSheet->firstCol();
 | 
						int firstColumnIndex = pSheet->firstCol();
 | 
				
			||||||
	int rowIndex         = firstRowIndex + startRowIndex;
 | 
						int rowIndex         = firstRowIndex + startRowIndex;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	unordered_map<wstring, CarDealer>* pCarDealerMap = getCarDealerMap();
 | 
						unordered_map<wstring, CarDealer>* pCarDealerMap = GetCarDealerMap();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	while ( rowIndex <= lastRowIndex )
 | 
						while ( rowIndex <= lastRowIndex )
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
@@ -341,7 +341,7 @@ void LoadRepairOrderFromXlsx( const std::wstring &       filePath,
 | 
				
			|||||||
	int firstRowIndex = pSheet->firstRow();
 | 
						int firstRowIndex = pSheet->firstRow();
 | 
				
			||||||
	int rowIndex      = firstRowIndex + startRowIndex;
 | 
						int rowIndex      = firstRowIndex + startRowIndex;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	auto* pCarDealerMap = getCarDealerMap();
 | 
						auto* pCarDealerMap = GetCarDealerMap();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	while ( rowIndex <= lastRowIndex )
 | 
						while ( rowIndex <= lastRowIndex )
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -50,6 +50,27 @@ public:
 | 
				
			|||||||
		return *this;
 | 
							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:
 | 
					private:
 | 
				
			||||||
	QString carDealerCode;
 | 
						QString carDealerCode;
 | 
				
			||||||
	QString carDealerName;
 | 
						QString carDealerName;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,7 +20,7 @@ using namespace ocilib;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
unordered_map<wstring, CarDealer> * pCarDealerMap = nullptr;
 | 
					unordered_map<wstring, CarDealer> * pCarDealerMap = nullptr;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void initCarDealerMap()
 | 
					void InitCarDealerMap()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if ( pCarDealerMap != nullptr )
 | 
						if ( pCarDealerMap != nullptr )
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
@@ -187,12 +187,26 @@ void initCarDealerMapCpp()
 | 
				
			|||||||
	Environment::Cleanup();
 | 
						Environment::Cleanup();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
std::unordered_map<wstring, CarDealer> * getCarDealerMap()
 | 
					std::unordered_map<wstring, CarDealer> * GetCarDealerMap()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if ( pCarDealerMap != nullptr )
 | 
						if ( pCarDealerMap != nullptr )
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		initCarDealerMap();
 | 
							InitCarDealerMap();
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return pCarDealerMap;
 | 
						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;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,10 +16,12 @@
 | 
				
			|||||||
/************************************************
 | 
					/************************************************
 | 
				
			||||||
* \brief 
 | 
					* \brief 
 | 
				
			||||||
************************************************/
 | 
					************************************************/
 | 
				
			||||||
void initCarDealerMap();
 | 
					void InitCarDealerMap();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/************************************************
 | 
					/************************************************
 | 
				
			||||||
* \brief 
 | 
					* \brief 
 | 
				
			||||||
* \return 
 | 
					* \return 
 | 
				
			||||||
************************************************/
 | 
					************************************************/
 | 
				
			||||||
std::unordered_map<std::wstring, CarDealer> * getCarDealerMap();
 | 
					std::unordered_map<std::wstring, CarDealer> * GetCarDealerMap();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					std::wstring GetCarDealerName(const std::wstring& carDealerCode);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,6 +3,7 @@
 | 
				
			|||||||
#include "../../../Data/DataManipulation/Excel/LoadFromExcel.h"
 | 
					#include "../../../Data/DataManipulation/Excel/LoadFromExcel.h"
 | 
				
			||||||
#include "../../../Data/DataManipulation/oracle/ImportToOracle.h"
 | 
					#include "../../../Data/DataManipulation/oracle/ImportToOracle.h"
 | 
				
			||||||
#include "../../util/qt/qt_util.h"
 | 
					#include "../../util/qt/qt_util.h"
 | 
				
			||||||
 | 
					#include "../../Data/Datastructure/CarDealer/CarDealerMap.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
using namespace std;
 | 
					using namespace std;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -73,7 +74,7 @@ void QCarDealerSchemaWidget::initWidgets()
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
	setLayout( ui.pLayoutMain );
 | 
						setLayout( ui.pLayoutMain );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	resizeTableWidgetTab( ui.pTableWidgetAchievement, 10 );
 | 
						resizeTableWidgetTab( ui.pTableWidgetSchema, 10 );
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void QCarDealerSchemaWidget::initSignal()
 | 
					void QCarDealerSchemaWidget::initSignal()
 | 
				
			||||||
@@ -83,4 +84,72 @@ void QCarDealerSchemaWidget::initSignal()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void QCarDealerSchemaWidget::showCarDealerSchema()
 | 
					void QCarDealerSchemaWidget::showCarDealerSchema()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
						ui.pTableWidgetSchema->clearContents();
 | 
				
			||||||
 | 
						ui.pTableWidgetSchema->setRowCount( schemeVector.size() );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						int                rowIndex    = 0;
 | 
				
			||||||
 | 
						int                columnIndex = 0;
 | 
				
			||||||
 | 
						QTableWidgetItem * pItem       = nullptr;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						auto carDealerMap = GetCarDealerMap();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						for ( auto iterSchema = schemeVector.begin();
 | 
				
			||||||
 | 
						      iterSchema != schemeVector.end();
 | 
				
			||||||
 | 
						      ++iterSchema )
 | 
				
			||||||
 | 
						{
 | 
				
			||||||
 | 
							//年度
 | 
				
			||||||
 | 
							pItem = new QTableWidgetItem(QString::fromStdWString(iterSchema->getTheYear()));
 | 
				
			||||||
 | 
							pItem->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							ui.pTableWidgetSchema->setItem(rowIndex, columnIndex++, pItem);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							//月份
 | 
				
			||||||
 | 
							pItem = new QTableWidgetItem(QString::fromStdWString(iterSchema->getTheMonth()));
 | 
				
			||||||
 | 
							pItem->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							ui.pTableWidgetSchema->setItem(rowIndex, columnIndex++, pItem);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							//车商代码
 | 
				
			||||||
 | 
							pItem = new QTableWidgetItem(QString::fromStdWString(iterSchema->getCarDealerCode()));
 | 
				
			||||||
 | 
							pItem->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							ui.pTableWidgetSchema->setItem(rowIndex, columnIndex++, pItem);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							//车商名称
 | 
				
			||||||
 | 
							QString carDealerName = QString::fromStdWString( carDealerMap() )
 | 
				
			||||||
 | 
							pItem = new QTableWidgetItem(QString::fromStdWString(iterSchema->()));
 | 
				
			||||||
 | 
							pItem->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							ui.pTableWidgetSchema->setItem(rowIndex, columnIndex++, pItem);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							//工时标准
 | 
				
			||||||
 | 
							pItem = new QTableWidgetItem(QString::fromStdWString(iterSchema->getTheYear()));
 | 
				
			||||||
 | 
							pItem->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							ui.pTableWidgetSchema->setItem(rowIndex, columnIndex++, pItem);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							//配件价格
 | 
				
			||||||
 | 
							pItem = new QTableWidgetItem(QString::fromStdWString(iterSchema->getTheYear()));
 | 
				
			||||||
 | 
							pItem->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							ui.pTableWidgetSchema->setItem(rowIndex, columnIndex++, pItem);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							//其他理赔支持
 | 
				
			||||||
 | 
							pItem = new QTableWidgetItem(QString::fromStdWString(iterSchema->getTheYear()));
 | 
				
			||||||
 | 
							pItem->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							ui.pTableWidgetSchema->setItem(rowIndex, columnIndex++, pItem);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							//营销活动方案
 | 
				
			||||||
 | 
							pItem = new QTableWidgetItem(QString::fromStdWString(iterSchema->getTheYear()));
 | 
				
			||||||
 | 
							pItem->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							ui.pTableWidgetSchema->setItem(rowIndex, columnIndex++, pItem);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							//是否达成预期
 | 
				
			||||||
 | 
							pItem = new QTableWidgetItem(QString::fromStdWString(iterSchema->getTheYear()));
 | 
				
			||||||
 | 
							pItem->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							ui.pTableWidgetSchema->setItem(rowIndex, columnIndex++, pItem);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -71,7 +71,7 @@
 | 
				
			|||||||
     </layout>
 | 
					     </layout>
 | 
				
			||||||
    </item>
 | 
					    </item>
 | 
				
			||||||
    <item>
 | 
					    <item>
 | 
				
			||||||
     <widget class="QTableWidget" name="pTableWidgetAchievement">
 | 
					     <widget class="QTableWidget" name="pTableWidgetSchema">
 | 
				
			||||||
      <column>
 | 
					      <column>
 | 
				
			||||||
       <property name="text">
 | 
					       <property name="text">
 | 
				
			||||||
        <string>年度</string>
 | 
					        <string>年度</string>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -35,7 +35,7 @@ int main( int argc, char * argv[] )
 | 
				
			|||||||
	//加载资源
 | 
						//加载资源
 | 
				
			||||||
	try
 | 
						try
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		initCarDealerMap();
 | 
							InitCarDealerMap();
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	catch ( runtime_error & error )
 | 
						catch ( runtime_error & error )
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -55,7 +55,7 @@ void excelTest()
 | 
				
			|||||||
	//LoadNewRepairMonitorReportFromXlsx(filePathNewRepairMonitor, 0, 1, repairMonitorVector);
 | 
						//LoadNewRepairMonitorReportFromXlsx(filePathNewRepairMonitor, 0, 1, repairMonitorVector);
 | 
				
			||||||
	//ImportNewRepairMonitorToOracle(userName, password, tnsName, repairMonitorVector);
 | 
						//ImportNewRepairMonitorToOracle(userName, password, tnsName, repairMonitorVector);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	//initCarDealerMap();
 | 
						//InitCarDealerMap();
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	return;
 | 
						return;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user