unnastyle commited on
Commit
ff5b642
ยท
verified ยท
1 Parent(s): 0c2e0c5

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +11 -3
app.py CHANGED
@@ -11,7 +11,7 @@ def process_excel_files(member_file, order_file, ์ž‘์„ฑ์ผ์ž):
11
 
12
  # ์—ด ์ด๋ฆ„ ํ™•์ธ
13
  required_member_columns = ['์•„์ด๋””', '์ด๋ฆ„', '์ƒํ˜ธ', '์‚ฌ์—…์ž๋ฒˆํ˜ธ', '์ด๋ฉ”์ผ']
14
- required_order_columns = ['์•„์ด๋””', '์ฃผ๋ฌธ๊ธˆ์•ก']
15
 
16
  missing_member_columns = [col for col in required_member_columns if col not in member_df.columns]
17
  missing_order_columns = [col for col in required_order_columns if col not in order_df.columns]
@@ -21,10 +21,18 @@ def process_excel_files(member_file, order_file, ์ž‘์„ฑ์ผ์ž):
21
  if missing_order_columns:
22
  return f"์—๋Ÿฌ ๋ฐœ์ƒ: '์ฃผ๋ฌธ๋‚ด์—ญ ํŒŒ์ผ'์— ๋ˆ„๋ฝ๋œ ์—ด: {missing_order_columns}. ํŒŒ์ผ ์—ด ์ด๋ฆ„: {list(order_df.columns)}"
23
 
24
- # ์ฃผ๋ฌธ๋‚ด์—ญ์˜ ์•„์ด๋”” ๊ธฐ์ค€ ์ค‘๋ณต ์ œ๊ฑฐ ๋ฐ ์ฃผ๋ฌธ๊ธˆ์•ก์ด 0์ธ ํ–‰ ์‚ญ์ œ
25
- order_df.drop_duplicates(subset="์•„์ด๋””", inplace=True)
26
  order_df = order_df[order_df['์ฃผ๋ฌธ๊ธˆ์•ก'] != 0]
27
 
 
 
 
 
 
 
 
 
28
  # ํšŒ์›์ •๋ณด์™€ ์ฃผ๋ฌธ๋‚ด์—ญ ๋ณ‘ํ•ฉ (์•„์ด๋”” ๊ธฐ์ค€)
29
  merged_df = pd.merge(order_df, member_df, on="์•„์ด๋””", how="left")
30
 
 
11
 
12
  # ์—ด ์ด๋ฆ„ ํ™•์ธ
13
  required_member_columns = ['์•„์ด๋””', '์ด๋ฆ„', '์ƒํ˜ธ', '์‚ฌ์—…์ž๋ฒˆํ˜ธ', '์ด๋ฉ”์ผ']
14
+ required_order_columns = ['์ฃผ๋ฌธ๋ฒˆํ˜ธ', '์•„์ด๋””', '์ฃผ๋ฌธ๊ธˆ์•ก']
15
 
16
  missing_member_columns = [col for col in required_member_columns if col not in member_df.columns]
17
  missing_order_columns = [col for col in required_order_columns if col not in order_df.columns]
 
21
  if missing_order_columns:
22
  return f"์—๋Ÿฌ ๋ฐœ์ƒ: '์ฃผ๋ฌธ๋‚ด์—ญ ํŒŒ์ผ'์— ๋ˆ„๋ฝ๋œ ์—ด: {missing_order_columns}. ํŒŒ์ผ ์—ด ์ด๋ฆ„: {list(order_df.columns)}"
23
 
24
+ # ์ฃผ๋ฌธ๋ฒˆํ˜ธ ๊ธฐ์ค€ ์ค‘๋ณต ์ œ๊ฑฐ ๋ฐ ์ฃผ๋ฌธ๊ธˆ์•ก์ด 0์ธ ํ–‰ ์‚ญ์ œ
25
+ order_df.drop_duplicates(subset="์ฃผ๋ฌธ๋ฒˆํ˜ธ", inplace=True)
26
  order_df = order_df[order_df['์ฃผ๋ฌธ๊ธˆ์•ก'] != 0]
27
 
28
+ # ๋™์ผ ์•„์ด๋””์˜ ์ฃผ๋ฌธ๊ธˆ์•ก ํ•ฉ์‚ฐํ•˜์—ฌ ์ฃผ๋ฌธํ•ฉ๊ณ„ ์—ด ์ƒ์„ฑ
29
+ order_sum = order_df.groupby("์•„์ด๋””")['์ฃผ๋ฌธ๊ธˆ์•ก'].sum().reset_index()
30
+ order_sum.rename(columns={'์ฃผ๋ฌธ๊ธˆ์•ก': '์ฃผ๋ฌธํ•ฉ๊ณ„'}, inplace=True)
31
+ order_df = pd.merge(order_df, order_sum, on="์•„์ด๋””", how="left")
32
+
33
+ # Q1 ์—ด์— ์ฃผ๋ฌธํ•ฉ๊ณ„ ์ถ”๊ฐ€
34
+ order_df['Q1'] = order_df['์ฃผ๋ฌธํ•ฉ๊ณ„']
35
+
36
  # ํšŒ์›์ •๋ณด์™€ ์ฃผ๋ฌธ๋‚ด์—ญ ๋ณ‘ํ•ฉ (์•„์ด๋”” ๊ธฐ์ค€)
37
  merged_df = pd.merge(order_df, member_df, on="์•„์ด๋””", how="left")
38