From ccd6a901a8c82b3bc23b5768b5f577ba07da55a0 Mon Sep 17 00:00:00 2001
From: Kane Wang <wangkane@qq.com>
Date: Fri, 27 Dec 2019 18:22:58 +0800
Subject: [PATCH] ...

---
 .../DataManipulation/Excel/LoadFromExcel.h    | 31 +++++++++++++++----
 .../oracle/ImportToOracle.cpp                 | 11 ++++---
 .../DataManipulation/oracle/ImportToOracle.h  |  8 ++---
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/代码/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.h b/代码/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.h
index 387693c..3cbd76c 100644
--- a/代码/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.h
+++ b/代码/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.h
@@ -6,24 +6,43 @@
 #include "../../Datastructure/CarDealerAchievement/CarDealerAchievement.h"
 #include "../../Datastructure/RepairOrder/RepairOrder.h"
 
+/************************************************
+* \brief 
+* \param filePath 
+* \param sheetIndex 
+* \param startRowIndex 
+* \param schemeVector 
+************************************************/
 void LoadCarDealerSchemeFromXlsx( const std::wstring &           filePath,
                                   unsigned int                   sheetIndex,
                                   unsigned int                   startRowIndex,
                                   std::vector<CarDealerScheme> & schemeVector );
 
+/************************************************
+* \brief 
+* \param filePath 
+* \param sheetIndex 
+* \param startRowIndex 
+* \param achievementVector 
+************************************************/
 void LoadCarDealerAchievementFromXlsx( const std::wstring &                filePath,
                                        unsigned int                        sheetIndex,
                                        unsigned int                        startRowIndex,
                                        std::vector<CarDealerAchievement> & achievementVector );
 
+/************************************************
+* \brief 
+* \param filePath 
+* \param sheetIndex 
+* \param startRowIndex 
+* \param orderVector 
+************************************************/
 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();
+// void LoadRepairOrderFromXls( const std::wstring &       filePath,
+//                              unsigned                   sheetIndex,
+//                              unsigned                   startRowIndex,
+//                              std::vector<RepairOrder> & orderVector );
diff --git a/代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.cpp b/代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.cpp
index f877020..3866e37 100644
--- a/代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.cpp
+++ b/代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.cpp
@@ -1,12 +1,15 @@
 #include <ocilib.h>
 #include <stdexcept>
+#include <QString>
 #include "ImportToOracle.h"
 
 using namespace std;
 
-void ImportCarDealerAchievementToOracle(std::string                         userName,
-	std::string                         password,
-	std::string                         tnsName,
-	std::vector<CarDealerAchievement>& achievementVector)
+
+void ImportCarDealerAchievementToOracle( std::string                         userName,
+                                         std::string                         password,
+                                         std::string                         tnsName,
+                                         std::vector<CarDealerAchievement> & achievementVector )
 {
+	
 }
diff --git a/代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.h b/代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.h
index 10c8727..0a200be 100644
--- a/代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.h
+++ b/代码/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.h
@@ -5,7 +5,7 @@
 #include "../../Datastructure/CarDealerAchievement/CarDealerAchievement.h"
 
 
-void ImportCarDealerAchievementToOracle(std::string                         userName,
-	std::string                         password,
-	std::string                         tnsName,
-	std::vector<CarDealerAchievement>& achievementVector);
+void ImportCarDealerAchievementToOracle( std::string                         userName,
+                                         std::string                         password,
+                                         std::string                         tnsName,
+                                         std::vector<CarDealerAchievement> & achievementVector );