diff --git a/htdocs/lib/Database/DBTarget.php b/htdocs/lib/Database/DBTarget.php
index 13df965..2213c53 100644
--- a/htdocs/lib/Database/DBTarget.php
+++ b/htdocs/lib/Database/DBTarget.php
@@ -120,6 +120,75 @@ class DBTarget extends Database {
         }
     }
 
+    /**
+     * 查詢此主題內所有標的資料
+     *
+     * @param  int   $thID 主題ID
+     * @return array 標的資料陣列，格式為:
+     *
+     *     array(
+     *         array(
+     *             'target_id'     => <標的ID>,
+     *             'area_id'       => <標的所在的區域ID>,
+     *             'hall_id'       => <標的所在的廳ID>,
+     *             'target_number' => <地圖上的標的編號>,
+     *             'name'          => <標的名稱>,
+     *             'map_url'       => <地圖路徑>,
+     *             'learn_time'    => <預估的學習時間>,
+     *             'PLj'           => <學習標的的人數限制>,
+     *             'Mj'            => <目前人數>,
+     *             'S'             => <學習標的飽和率上限>,
+     *             'Fj'            => <學習標的滿額指標>
+     *         )
+     *     );
+     *
+     */
+    public function queryAllTargetByTheme($thID) {
+
+        $sqlString = "SELECT `ThID`, Target.`TID`, `Weights`, ".
+            "Target.`AID`, Area.`HID`, `TNum`, `TName`, `TMapID`, `TLearnTime`, ".
+            "`PLj`, `Mj`, `S`, IF(`Mj` >= `PLj`, 1, 0) AS Fj ".
+            "FROM `".$this->table('TBelong')."` AS Belong ".
+            "LEFT JOIN `".$this->table('Target')."` as Target ".
+            "ON Belong.`TID` = Target.`TID` ".
+            "LEFT JOIN `".$this->table('Area')."` as Area ".
+            "ON Area.`AID` = Target.`AID` ".
+            "WHERE `ThID` = ".$this->connDB->quote($thID);
+
+        $query = $this->connDB->prepare($sqlString);
+        $query->execute();
+
+        $queryResultAll = $query->fetchAll();
+        // 如果有查到一筆以上
+        if( count($queryResultAll) >= 1 ) {
+            // 製作回傳結果陣列
+            $result = array();
+            foreach($queryResultAll as $key => $thisResult) {
+
+                array_push($result,
+                    array( 'theme_id'      => $thisResult['ThID'],
+                           'target_id'     => $thisResult['TID'],
+                           'weights'       => $thisResult['Weights'],
+                           'area_id'       => $thisResult['AID'],
+                           'hall_id'       => $thisResult['HID'],
+                           'target_number' => $thisResult['TNum'],
+                           'name'          => $thisResult['TName'],
+                           'map_url'       => $thisResult['TMapID'],
+                           'learn_time'    => $thisResult['TLearnTime'],
+                           'PLj'           => $thisResult['PLj'],
+                           'Mj'            => $thisResult['Mj'],
+                           'S'             => $thisResult['S'],
+                           'Fj'            => $thisResult['Fj']
+                ));
+            }
+            return $result;
+        }
+        // 若都沒查到的話
+        else {
+            return null;
+        }
+    }
+
     /**
      * 查詢所有標的資料
      *
@@ -144,7 +213,7 @@ class DBTarget extends Database {
      */
     public function queryAllTarget() {
 
-        return $this->queryAreaByWhere("1");
+        return $this->queryTargetByWhere("1");
     }
 
     /**
diff --git a/htdocs/lib/Target/TargetManager.php b/htdocs/lib/Target/TargetManager.php
new file mode 100644
index 0000000..5e5a8fe
--- /dev/null
+++ b/htdocs/lib/Target/TargetManager.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Target.php
+ */
+
+namespace UElearning\Target;
+
+require_once UELEARNING_LIB_ROOT.'/Database/DBTarget.php';
+require_once UELEARNING_LIB_ROOT.'/Target/Exception.php';
+use UElearning\Database;
+use UElearning\Exception;
+
+/**
+ * 標的管理類別
+ *
+ * @version         2.0.0
+ * @package         UElearning
+ * @subpackage      Target
+ */
+class TargetManager {
+
+    /**
+     * 取得這個主題內所有的標的資訊
+     *
+     * @param  int   $thID 主題ID
+     * @return array 標的資訊清單陣列，格式為:
+     *
+     *     array(
+     *         array(
+     *             'theme_id'      => <主題ID>
+     *             'target_id'     => <標的ID>,
+     *             'weights'       => <比重>.
+     *             'area_id'       => <標的所在的區域ID>,
+     *             'hall_id'       => <標的所在的廳ID>,
+     *             'target_number' => <地圖上的標的編號>,
+     *             'name'          => <標的名稱>,
+     *             'map_url'       => <地圖路徑>,
+     *             'learn_time'    => <預估的學習時間>,
+     *             'PLj'           => <學習標的的人數限制>,
+     *             'Mj'            => <目前人數>,
+     *             'S'             => <學習標的飽和率上限>,
+     *             'Fj'            => <學習標的滿額指標>
+     *         )
+     *     );
+     *
+     * @since 2.0.0
+     */
+    public function getAllTargetInfoByTheme($thID) {
+
+        $db = new Database\DBTarget();
+        return $db->queryAllTargetByTheme($thID);
+    }
+
+    /**
+     * 取得所有的標的資訊
+     *
+     * @return array 標的資訊清單陣列，格式為:
+     *
+     *     array(
+     *         array(
+     *             'target_id'     => <標的ID>,
+     *             'area_id'       => <標的所在的區域ID>,
+     *             'hall_id'       => <標的所在的廳ID>,
+     *             'target_number' => <地圖上的標的編號>,
+     *             'name'          => <標的名稱>,
+     *             'map_url'       => <地圖路徑>,
+     *             'learn_time'    => <預估的學習時間>,
+     *             'PLj'           => <學習標的的人數限制>,
+     *             'Mj'            => <目前人數>,
+     *             'S'             => <學習標的飽和率上限>,
+     *             'Fj'            => <學習標的滿額指標>
+     *         )
+     *     );
+     *
+     * @since 2.0.0
+     */
+    public function getAllTargetInfo() {
+
+        $db = new Database\DBTarget();
+        return $db->queryAllTarget();
+    }
+
+}