ソースを参照

新增子女數量 修改預設員工及部門名單

maa3520 2 年 前
コミット
d371bc6144

+ 1 - 0
app/Models/CheckIn.php

@@ -15,6 +15,7 @@ class CheckIn extends Model
         'department_id',
         'region',
         'is_checked_in',
+        'children_count',
         'is_awarded',
         'activity_id',
     ];

+ 175 - 140
database/MAA.json

@@ -1,4 +1,9 @@
 [{
+        "user_id": "0002",
+        "name": "莫若楫",
+        "department_id": "L00"
+    },
+    {
         "user_id": "0028",
         "name": "王劍虹",
         "department_id": "U30"
@@ -36,7 +41,12 @@
     {
         "user_id": "0513",
         "name": "李國雄",
-        "department_id": "A21"
+        "department_id": "A00"
+    },
+    {
+        "user_id": "0515",
+        "name": "吳定恩",
+        "department_id": "L10"
     },
     {
         "user_id": "0518",
@@ -91,7 +101,7 @@
     {
         "user_id": "0641",
         "name": "謝玉敏",
-        "department_id": "A24"
+        "department_id": "A00"
     },
     {
         "user_id": "0651",
@@ -116,7 +126,7 @@
     {
         "user_id": "0776",
         "name": "陳桂英",
-        "department_id": "A24"
+        "department_id": "A00"
     },
     {
         "user_id": "0809",
@@ -171,7 +181,7 @@
     {
         "user_id": "1063",
         "name": "簡銘宏",
-        "department_id": "A21"
+        "department_id": "A00"
     },
     {
         "user_id": "1079",
@@ -386,7 +396,7 @@
     {
         "user_id": "1533",
         "name": "施麗珠",
-        "department_id": "A24"
+        "department_id": "A00"
     },
     {
         "user_id": "1538",
@@ -481,7 +491,7 @@
     {
         "user_id": "1795",
         "name": "吳正偉",
-        "department_id": "A21"
+        "department_id": "A00"
     },
     {
         "user_id": "1808",
@@ -676,7 +686,7 @@
     {
         "user_id": "2288",
         "name": "查立葳",
-        "department_id": "A21"
+        "department_id": "A00"
     },
     {
         "user_id": "2292",
@@ -738,11 +748,6 @@
         "name": "林芳倩",
         "department_id": "B00"
     },
-    {
-        "user_id": "2398",
-        "name": "郭美婷",
-        "department_id": "B00"
-    },
     {
         "user_id": "2399",
         "name": "謝必松",
@@ -981,7 +986,7 @@
     {
         "user_id": "2713",
         "name": "王雅惠",
-        "department_id": "J00"
+        "department_id": "J10"
     },
     {
         "user_id": "2716",
@@ -1018,11 +1023,6 @@
         "name": "江長璟",
         "department_id": "B10"
     },
-    {
-        "user_id": "2766",
-        "name": "郭福浚",
-        "department_id": "B10"
-    },
     {
         "user_id": "2773",
         "name": "萬鍾",
@@ -1088,11 +1088,6 @@
         "name": "宋士豪",
         "department_id": "G00"
     },
-    {
-        "user_id": "2840",
-        "name": "高瑞霖",
-        "department_id": "X10"
-    },
     {
         "user_id": "2841",
         "name": "薛方雅",
@@ -1143,11 +1138,6 @@
         "name": "洪勝練",
         "department_id": "X08"
     },
-    {
-        "user_id": "2890",
-        "name": "簡堯崇",
-        "department_id": "L40"
-    },
     {
         "user_id": "2892",
         "name": "李宇曜",
@@ -1178,6 +1168,11 @@
         "name": "黃榮華",
         "department_id": "X10"
     },
+    {
+        "user_id": "2921",
+        "name": "林秉誼",
+        "department_id": "B10"
+    },
     {
         "user_id": "2922",
         "name": "李嘉容",
@@ -1198,11 +1193,6 @@
         "name": "林佳慧",
         "department_id": "C00"
     },
-    {
-        "user_id": "2942",
-        "name": "陳長昱",
-        "department_id": "F10"
-    },
     {
         "user_id": "2945",
         "name": "賴可捷",
@@ -1216,6 +1206,11 @@
     {
         "user_id": "2951",
         "name": "姜本家",
+        "department_id": "X12"
+    },
+    {
+        "user_id": "2952",
+        "name": "黃琨崴",
         "department_id": "C00"
     },
     {
@@ -1291,7 +1286,7 @@
     {
         "user_id": "2988",
         "name": "黃珮玲",
-        "department_id": "A21"
+        "department_id": "A00"
     },
     {
         "user_id": "2990",
@@ -1321,7 +1316,7 @@
     {
         "user_id": "3004",
         "name": "宋政達",
-        "department_id": "X12"
+        "department_id": "C00"
     },
     {
         "user_id": "3005",
@@ -1333,11 +1328,6 @@
         "name": "陳靖宜",
         "department_id": "P10"
     },
-    {
-        "user_id": "3008",
-        "name": "蘇裕詠",
-        "department_id": "J10"
-    },
     {
         "user_id": "3009",
         "name": "陳玠穎",
@@ -1446,7 +1436,7 @@
     {
         "user_id": "3098",
         "name": "童詩涵",
-        "department_id": "A24"
+        "department_id": "A00"
     },
     {
         "user_id": "3108",
@@ -1556,7 +1546,7 @@
     {
         "user_id": "3175",
         "name": "謝明晏",
-        "department_id": "A21"
+        "department_id": "A00"
     },
     {
         "user_id": "3178",
@@ -1606,7 +1596,7 @@
     {
         "user_id": "3193",
         "name": "陳逸人",
-        "department_id": "A21"
+        "department_id": "A00"
     },
     {
         "user_id": "3195",
@@ -1618,11 +1608,6 @@
         "name": "張立志",
         "department_id": "B10"
     },
-    {
-        "user_id": "3198",
-        "name": "徐詩雅",
-        "department_id": "B10"
-    },
     {
         "user_id": "3200",
         "name": "謝焱龍",
@@ -1636,7 +1621,7 @@
     {
         "user_id": "3206",
         "name": "林宜嫺",
-        "department_id": "A24"
+        "department_id": "A00"
     },
     {
         "user_id": "3209",
@@ -1721,7 +1706,7 @@
     {
         "user_id": "3266",
         "name": "簡翊宇",
-        "department_id": "X09"
+        "department_id": "J00"
     },
     {
         "user_id": "3267",
@@ -1753,11 +1738,6 @@
         "name": "蔡長勳",
         "department_id": "B10"
     },
-    {
-        "user_id": "3274",
-        "name": "呂奎融",
-        "department_id": "P10"
-    },
     {
         "user_id": "3275",
         "name": "吳柏諺",
@@ -1876,7 +1856,7 @@
     {
         "user_id": "3320",
         "name": "王姿嵐",
-        "department_id": "A21"
+        "department_id": "A00"
     },
     {
         "user_id": "3321",
@@ -2076,7 +2056,7 @@
     {
         "user_id": "3405",
         "name": "李旻錚",
-        "department_id": "A21"
+        "department_id": "A00"
     },
     {
         "user_id": "3406",
@@ -2100,7 +2080,7 @@
     },
     {
         "user_id": "3412",
-        "name": "洪瑄",
+        "name": "洪瑄",
         "department_id": "B00"
     },
     {
@@ -2261,7 +2241,7 @@
     {
         "user_id": "3470",
         "name": "吳欣穎",
-        "department_id": "A21"
+        "department_id": "A00"
     },
     {
         "user_id": "3471",
@@ -2301,7 +2281,7 @@
     {
         "user_id": "3483",
         "name": "張婷媗",
-        "department_id": "A21"
+        "department_id": "A00"
     },
     {
         "user_id": "3484",
@@ -2316,7 +2296,7 @@
     {
         "user_id": "3487",
         "name": "周鴻謀",
-        "department_id": "A21"
+        "department_id": "A00"
     },
     {
         "user_id": "3488",
@@ -2453,11 +2433,6 @@
         "name": "王毓賢",
         "department_id": "C00"
     },
-    {
-        "user_id": "3528",
-        "name": "李穆婷",
-        "department_id": "B10"
-    },
     {
         "user_id": "3529",
         "name": "陳雅旼",
@@ -2488,11 +2463,6 @@
         "name": "胡寧康",
         "department_id": "X08"
     },
-    {
-        "user_id": "3539",
-        "name": "黃紀筌",
-        "department_id": "X10"
-    },
     {
         "user_id": "3540",
         "name": "李志穎",
@@ -2518,11 +2488,6 @@
         "name": "涂文彬",
         "department_id": "X10"
     },
-    {
-        "user_id": "3546",
-        "name": "李豪凱",
-        "department_id": "X10"
-    },
     {
         "user_id": "3548",
         "name": "李虹萱",
@@ -2588,11 +2553,6 @@
         "name": "朱秋燕",
         "department_id": "G00"
     },
-    {
-        "user_id": "3567",
-        "name": "林振昌",
-        "department_id": "C00"
-    },
     {
         "user_id": "3568",
         "name": "蔡季萍",
@@ -2603,11 +2563,6 @@
         "name": "吳沛紋",
         "department_id": "B10"
     },
-    {
-        "user_id": "3571",
-        "name": "劉培華",
-        "department_id": "X10"
-    },
     {
         "user_id": "3572",
         "name": "胡焱明",
@@ -2623,11 +2578,6 @@
         "name": "林士弘",
         "department_id": "X10"
     },
-    {
-        "user_id": "3575",
-        "name": "黃景林",
-        "department_id": "B10"
-    },
     {
         "user_id": "3578",
         "name": "黃姵榕",
@@ -2641,7 +2591,7 @@
     {
         "user_id": "3580",
         "name": "連偉仲",
-        "department_id": "A21"
+        "department_id": "A00"
     },
     {
         "user_id": "3581",
@@ -2678,11 +2628,6 @@
         "name": "陳國茹",
         "department_id": "P20"
     },
-    {
-        "user_id": "3591",
-        "name": "邱致皓",
-        "department_id": "X10"
-    },
     {
         "user_id": "3592",
         "name": "洪蜜芬",
@@ -2693,11 +2638,6 @@
         "name": "劉東旭",
         "department_id": "F10"
     },
-    {
-        "user_id": "3594",
-        "name": "羅文琍",
-        "department_id": "C00"
-    },
     {
         "user_id": "3595",
         "name": "戴安娜",
@@ -2768,11 +2708,6 @@
         "name": "楊忠記",
         "department_id": "B00"
     },
-    {
-        "user_id": "3617",
-        "name": "黃沛婕",
-        "department_id": "S00"
-    },
     {
         "user_id": "3618",
         "name": "趙尉均",
@@ -2786,7 +2721,7 @@
     {
         "user_id": "3621",
         "name": "洪詔琪",
-        "department_id": "C10"
+        "department_id": "G00"
     },
     {
         "user_id": "3622",
@@ -2813,11 +2748,6 @@
         "name": "劉主謙",
         "department_id": "B10"
     },
-    {
-        "user_id": "3627",
-        "name": "鍾官偉",
-        "department_id": "X10"
-    },
     {
         "user_id": "3628",
         "name": "鍾大祺",
@@ -2848,11 +2778,6 @@
         "name": "董辰嫣",
         "department_id": "F10"
     },
-    {
-        "user_id": "3637",
-        "name": "劉律均",
-        "department_id": "X10"
-    },
     {
         "user_id": "3639",
         "name": "黎通安",
@@ -2923,11 +2848,6 @@
         "name": "李孟文",
         "department_id": "B00"
     },
-    {
-        "user_id": "3656",
-        "name": "梁依儒",
-        "department_id": "B10"
-    },
     {
         "user_id": "3657",
         "name": "賴冠臻",
@@ -2988,6 +2908,11 @@
         "name": "曾約恒",
         "department_id": "P20"
     },
+    {
+        "user_id": "3671",
+        "name": "盧彥廷",
+        "department_id": "R00"
+    },
     {
         "user_id": "3672",
         "name": "袁光陸",
@@ -3001,7 +2926,7 @@
     {
         "user_id": "3674",
         "name": "林瑋婷",
-        "department_id": "A21"
+        "department_id": "A00"
     },
     {
         "user_id": "3675",
@@ -3098,11 +3023,6 @@
         "name": "游勇凱",
         "department_id": "B10"
     },
-    {
-        "user_id": "3697",
-        "name": "葉致尹",
-        "department_id": "B10"
-    },
     {
         "user_id": "3699",
         "name": "曾文南",
@@ -3238,6 +3158,121 @@
         "name": "林黛菁",
         "department_id": "B10"
     },
+    {
+        "user_id": "3726",
+        "name": "廖肇昌",
+        "department_id": "L10"
+    },
+    {
+        "user_id": "3727",
+        "name": "黃詩婷",
+        "department_id": "I00"
+    },
+    {
+        "user_id": "3728",
+        "name": "陳嘉瑜",
+        "department_id": "L40"
+    },
+    {
+        "user_id": "3729",
+        "name": "黃存強",
+        "department_id": "B00"
+    },
+    {
+        "user_id": "3730",
+        "name": "蔡德權",
+        "department_id": "B00"
+    },
+    {
+        "user_id": "3731",
+        "name": "方怡婷",
+        "department_id": "B00"
+    },
+    {
+        "user_id": "3732",
+        "name": "王聖閔",
+        "department_id": "S00"
+    },
+    {
+        "user_id": "3733",
+        "name": "温富霖",
+        "department_id": "G00"
+    },
+    {
+        "user_id": "3734",
+        "name": "蘇敬源",
+        "department_id": "U30"
+    },
+    {
+        "user_id": "3735",
+        "name": "江桐",
+        "department_id": "X05"
+    },
+    {
+        "user_id": "3736",
+        "name": "蕭宴詔",
+        "department_id": "X10"
+    },
+    {
+        "user_id": "3737",
+        "name": "Wittawat",
+        "department_id": "G00"
+    },
+    {
+        "user_id": "3738",
+        "name": "潘伊萍",
+        "department_id": "I00"
+    },
+    {
+        "user_id": "3739",
+        "name": "鄭繼陀",
+        "department_id": "S00"
+    },
+    {
+        "user_id": "3740",
+        "name": "蕭國偉",
+        "department_id": "B10"
+    },
+    {
+        "user_id": "3741",
+        "name": "羅婉楺",
+        "department_id": "J20"
+    },
+    {
+        "user_id": "3742",
+        "name": "陳嵩哲",
+        "department_id": "B00"
+    },
+    {
+        "user_id": "3743",
+        "name": "趙明",
+        "department_id": "X10"
+    },
+    {
+        "user_id": "3744",
+        "name": "邱永蕙",
+        "department_id": "C00"
+    },
+    {
+        "user_id": "3745",
+        "name": "陳哲",
+        "department_id": "G00"
+    },
+    {
+        "user_id": "3746",
+        "name": "朱慶中",
+        "department_id": "J20"
+    },
+    {
+        "user_id": "3747",
+        "name": "卓茂生",
+        "department_id": "B10"
+    },
+    {
+        "user_id": "3748",
+        "name": "林坤湧",
+        "department_id": "X10"
+    },
     {
         "user_id": "6124",
         "name": "龔惠娟",
@@ -3273,11 +3308,6 @@
         "name": "黃南輝",
         "department_id": "U20"
     },
-    {
-        "user_id": "8239",
-        "name": "邱永蕙",
-        "department_id": "C00"
-    },
     {
         "user_id": "8246",
         "name": "李尚謙",
@@ -3308,6 +3338,11 @@
         "name": "黃惠芳",
         "department_id": "J20"
     },
+    {
+        "user_id": "S063",
+        "name": "張若愚",
+        "department_id": "J20"
+    },
     {
         "user_id": "northdept1",
         "name": "北區1",
@@ -3332,32 +3367,32 @@
         "user_id": "centerdept1",
         "name": "中區1",
         "department_id": "xxx"
-    }, 
+    },
     {
         "user_id": "centerdept2",
         "name": "中區2",
         "department_id": "xxx"
-    }, 
+    },
     {
         "user_id": "centerdept3",
         "name": "中區3",
         "department_id": "xxx"
-    }, 
+    },
     {
         "user_id": "southdept1",
         "name": "南區1",
         "department_id": "xxx"
-    }, 
+    },
     {
         "user_id": "southdept2",
         "name": "南區2",
         "department_id": "xxx"
-    }, 
+    },
     {
         "user_id": "southdept3",
         "name": "南區3",
         "department_id": "xxx"
-    }, 
+    },
     {
         "user_id": "host",
         "name": "主持人",

+ 101 - 146
database/MAA_department.json

@@ -1,217 +1,172 @@
-[{
-        "department_id": "A00",
-        "department_name": "行政管理部",
-        "alias": "行政管理部",
-        "manager": "A00"
-    },
-    {
-        "department_id": "A21",
-        "department_name": "行政管理部庶務科",
-        "alias": "行管部庶務科",
-        "manager": "A21"
-    },
+[
     {
-        "department_id": "A22",
-        "department_name": "人力資源科",
-        "alias": "人力資源科",
-        "manager": "A22"
+      "department_id": "L00",
+      "department_name": "董事長室",
+      "alias": "董事長室"
     },
     {
-        "department_id": "A24",
-        "department_name": "行政管理部文書科",
-        "alias": "行管部文書科",
-        "manager": "A24"
+      "department_id": "U30",
+      "department_name": "工程監理群",
+      "alias": "工程監理群"
     },
     {
-        "department_id": "B00",
-        "department_name": "南區辦事處",
-        "alias": "南區辦事處",
-        "manager": "B00"
+      "department_id": "B00",
+      "department_name": "南區辦事處",
+      "alias": "南區辦事處"
     },
     {
-        "department_id": "B10",
-        "department_name": "中區辦事處",
-        "alias": "中區辦事處",
-        "manager": "B10"
+      "department_id": "E10",
+      "department_name": "工程製圖科",
+      "alias": "工程製圖科"
     },
     {
-        "department_id": "C00",
-        "department_name": "工程管理一部",
-        "alias": "工程管理一部",
-        "manager": "C00"
+      "department_id": "U20",
+      "department_name": "工程設計群",
+      "alias": "工程設計群"
     },
     {
-        "department_id": "C10",
-        "department_name": "工程管理二部",
-        "alias": "工程管理二部",
-        "manager": "C10"
+      "department_id": "S00",
+      "department_name": "結構工程部",
+      "alias": "結構部"
     },
     {
-        "department_id": "D00",
-        "department_name": "發展與企畫部",
-        "alias": "發展與企畫部",
-        "manager": "D00"
+      "department_id": "A22",
+      "department_name": "人力資源科",
+      "alias": "人資科"
     },
     {
-        "department_id": "E10",
-        "department_name": "工程製圖科",
-        "alias": "工程製圖科",
-        "manager": "E10"
+      "department_id": "J20",
+      "department_name": "軌道工程部",
+      "alias": "軌道部"
     },
     {
-        "department_id": "F10",
-        "department_name": "工務部",
-        "alias": "工務部",
-        "manager": "F10"
+      "department_id": "A00",
+      "department_name": "行政管理部",
+      "alias": "行管部"
     },
     {
-        "department_id": "G00",
-        "department_name": "大地工程部",
-        "alias": "大地工程部",
-        "manager": "G00"
+      "department_id": "L10",
+      "department_name": "總經理室",
+      "alias": "總經理室"
     },
     {
-        "department_id": "I00",
-        "department_name": "財務部",
-        "alias": "財務部",
-        "manager": "I00"
+      "department_id": "X10",
+      "department_name": "塭仔圳監造專案",
+      "alias": "塭仔圳專案"
     },
     {
-        "department_id": "J00",
-        "department_name": "運輸及土木工程部",
-        "alias": "運輸土木部",
-        "manager": "J00"
+      "department_id": "P10",
+      "department_name": "環境水務部",
+      "alias": "環水部"
     },
     {
-        "department_id": "J10",
-        "department_name": "城鄉發展部",
-        "alias": "城鄉發展部",
-        "manager": "J10"
+      "department_id": "M00",
+      "department_name": "資訊中心",
+      "alias": "資訊中心"
     },
     {
-        "department_id": "J20",
-        "department_name": "軌道工程部",
-        "alias": "軌道工程部",
-        "manager": "J20"
+      "department_id": "F10",
+      "department_name": "工務部",
+      "alias": "工務部"
     },
     {
-        "department_id": "L00",
-        "department_name": "董事長室",
-        "alias": "董事長室",
-        "manager": "L00"
+      "department_id": "U50",
+      "department_name": "建築及設施群",
+      "alias": "建築設施群"
     },
     {
-        "department_id": "L10",
-        "department_name": "總經理室",
-        "alias": "總經理室",
-        "manager": "L10"
+      "department_id": "L60",
+      "department_name": "成本中心",
+      "alias": "成本中心"
     },
     {
-        "department_id": "L40",
-        "department_name": "企業發展中心",
-        "alias": "企業發展中心",
-        "manager": "L40"
+      "department_id": "X05",
+      "department_name": "數位工程發展部",
+      "alias": "數位發展部"
     },
     {
-        "department_id": "L60",
-        "department_name": "成本中心",
-        "alias": "成本中心",
-        "manager": "L60"
+      "department_id": "X06",
+      "department_name": "淡海輕軌計畫監造專案",
+      "alias": "淡海輕軌專案"
     },
     {
-        "department_id": "M00",
-        "department_name": "資訊中心",
-        "alias": "資訊中心",
-        "manager": "M00"
+      "department_id": "G00",
+      "department_name": "大地工程部",
+      "alias": "大地部"
     },
     {
-        "department_id": "P10",
-        "department_name": "環境水務部",
-        "alias": "環境水務部",
-        "manager": "P10"
+      "department_id": "J10",
+      "department_name": "城鄉發展部",
+      "alias": "城鄉發展部"
     },
     {
-        "department_id": "P20",
-        "department_name": "環境永續部",
-        "alias": "環境永續部",
-        "manager": "P20"
+      "department_id": "I00",
+      "department_name": "財務部",
+      "alias": "財務部"
     },
     {
-        "department_id": "R00",
-        "department_name": "機電系統工程部",
-        "alias": "機電工程部",
-        "manager": "R00"
+      "department_id": "X12",
+      "department_name": "萬大果菜市場專案",
+      "alias": "萬大市場專案"
     },
     {
-        "department_id": "S00",
-        "department_name": "結構工程部",
-        "alias": "結構工程部",
-        "manager": "S00"
+      "department_id": "J00",
+      "department_name": "運輸及土木工程部",
+      "alias": "運土部"
     },
     {
-        "department_id": "U20",
-        "department_name": "工程設計群",
-        "alias": "工程設計群",
-        "manager": "U20"
+      "department_id": "L40",
+      "department_name": "企業發展中心",
+      "alias": "企發中心"
     },
     {
-        "department_id": "U30",
-        "department_name": "工程監理群",
-        "alias": "工程監理群",
-        "manager": "U30"
+      "department_id": "C00",
+      "department_name": "工程管理一部",
+      "alias": "工管一部"
     },
     {
-        "department_id": "U40",
-        "department_name": "總管理處",
-        "alias": "總管理處",
-        "manager": "U40"
+      "department_id": "B10",
+      "department_name": "中區辦事處",
+      "alias": "中區辦事處"
     },
     {
-        "department_id": "U50",
-        "department_name": "建築及設施群",
-        "alias": "建築及設施群",
-        "manager": "U50"
+      "department_id": "D00",
+      "department_name": "發展與企畫部",
+      "alias": "發展與企畫部"
     },
     {
-        "department_id": "X05",
-        "department_name": "數位工程發展部",
-        "alias": "數位發展部",
-        "manager": "X05"
+      "department_id": "C10",
+      "department_name": "工程管理二部",
+      "alias": "工管二部"
     },
     {
-        "department_id": "X06",
-        "department_name": "淡海輕軌計畫監造專案",
-        "alias": "淡海輕軌專案",
-        "manager": "X06"
+      "department_id": "X08",
+      "department_name": "安坑輕軌計畫監造專案",
+      "alias": "安坑輕軌專案"
     },
     {
-        "department_id": "X08",
-        "department_name": "安坑輕軌計畫監造專案",
-        "alias": "安坑輕軌專案",
-        "manager": "X08"
+      "department_id": "X09",
+      "department_name": "先進技術中心",
+      "alias": "先進技術中心"
     },
     {
-        "department_id": "X09",
-        "department_name": "先進技術中心",
-        "alias": "先進技術中心",
-        "manager": "X09"
+      "department_id": "P20",
+      "department_name": "環境永續部",
+      "alias": "環境永續部"
     },
     {
-        "department_id": "X10",
-        "department_name": "塭仔圳專案",
-        "alias": "塭仔圳專案",
-        "manager": "X10"
+      "department_id": "R00",
+      "department_name": "機電系統工程部",
+      "alias": "機電部"
     },
     {
-        "department_id": "X12",
-        "department_name": "萬大果菜市場專案",
-        "alias": "萬大市場專案",
-        "manager": "X12"
+      "department_id": "U40",
+      "department_name": "總管理處",
+      "alias": "總管理處"
     },
     {
         "department_id": "guest",
         "department_name": "來賓",
-        "alias": "來賓",
-        "manager": "guest"
+        "alias": "來賓"
     }
 ]

+ 1 - 0
database/migrations/2023_02_06_030248_create_check_ins_table.php

@@ -20,6 +20,7 @@ return new class extends Migration
             $table->string('department_id')->nullable();
             $table->string('region');
             $table->boolean('is_checked_in');
+            $table->integer('children_count')->default(0);
             $table->boolean('is_awarded');
             $table->string('activity_id');
             $table->timestamps();

+ 1 - 11
database/seeders/CheckInSeeder.php

@@ -38,6 +38,7 @@ class CheckInSeeder extends Seeder
                     'department_id' => $value->department_id,
                     'region' => $region,
                     'is_checked_in' => false,
+                    'children_count' => 0,
                     'is_awarded' => false,
                     'activity_id' => 1,
                     'created_at' => now(),
@@ -45,16 +46,5 @@ class CheckInSeeder extends Seeder
                 ]);
             }
         }
-        CheckIn::create([
-            'user_id' => 'A100',
-            'name' => '來賓XXX',
-            'department_id' => null,
-            'region' => '來賓',
-            'is_checked_in' => true,
-            'is_awarded' => false,
-            'activity_id' => 1,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
     }
 }

+ 7 - 7
database/seeders/DatabaseSeeder.php

@@ -66,12 +66,12 @@ class DatabaseSeeder extends Seeder
 
         }
 
-        // $this->call([
-        //     ActivitySeeder::class,
-        //     CheckInSeeder::class,
-        //     PrizeSeeder::class,
-        //     RecipientsSeeder::class,
-        //     DepartmentSeeder::class,
-        // ]);
+        $this->call([
+            // ActivitySeeder::class,
+            CheckInSeeder::class,
+            // PrizeSeeder::class,
+            // RecipientsSeeder::class,
+            DepartmentSeeder::class,
+        ]);
     }
 }

+ 2 - 2
database/seeders/DepartmentSeeder.php

@@ -18,14 +18,14 @@ class DepartmentSeeder extends Seeder
     {
         Department::truncate();
         $json = File::get("database/MAA_department.json");
-        $countries = json_decode($json);
+        $countries = json_decode($json);    
 
         foreach ($countries as $key => $value) {
             Department::insert([
                 'department_id' => $value->department_id,
                 'department_name' => $value->department_name,
                 'alias' => $value->alias,
-                'manager' => $value->manager,
+                'manager' => $value->department_id,
             ]);
         }
     }

+ 11 - 5
resources/js/src/views/lottery/CheckIn.vue

@@ -38,6 +38,12 @@
 							<b-card-text>
 								{{ checkinStatus(user.is_checked_in) }}
 							</b-card-text>
+							<b-card-text style="color: #0085DD">
+								15歲以下子女數量
+							</b-card-text>
+							<b-card-text>
+								{{ user.children_count }}
+							</b-card-text>
 						</div>
 					</b-col>
 				</b-row>
@@ -102,9 +108,9 @@ export default {
 	},
 	data() {
 		return {
-			user: { name: " ", user_id: " ", department: " " },
+			user: { name: " ", user_id: " ", department: " ", children_count: "0" },
 			input: "",
-            isNum: true,
+			isNum: true,
 		}
 	},
 	created() {
@@ -126,17 +132,17 @@ export default {
 				if (response.data.user) {
 					this.user = response.data.user;
 				} else {
-					this.user = { name: "查無此人", user_id: " ", department: " " };
+					this.user = { name: "查無此人", user_id: " ", department: " ", children_count: 0 };
 				}
 				this.input = "";
 			}).catch(error => {
 				console.log(error)
-				this.user = { name: "查無此人", user_id: " ", department: " " };
+				this.user = { name: "查無此人", user_id: " ", department: " ", children_count: 0 };
 				this.input = "";
 			});
 		},
 		showMsgBoxTwo() {
-			this.user = { name: " ", user_id: " ", department: " " };
+			this.user = { name: " ", user_id: " ", department: " ", children_count: 0 };
 		},
 		showToast(variant) {