From d18d6003347641be7d3adea709244e3b33b44f54 Mon Sep 17 00:00:00 2001
From: fengbohan <1953356163@qq.com>
Date: Mon, 29 Jan 2024 10:19:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=AA=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto_run_python.bat | 2 +-
 config.yaml         | 6 +++---
 gen_word.py         | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/auto_run_python.bat b/auto_run_python.bat
index deb5355..df68304 100644
--- a/auto_run_python.bat
+++ b/auto_run_python.bat
@@ -1,4 +1,4 @@
 @REM @echo off
-call .\week_report\Scripts\activate
+call .\env\Scripts\activate
 python gen_word.py
 pause
diff --git a/config.yaml b/config.yaml
index bb62221..dedf180 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,4 +1,4 @@
 user_name: 冯博涵
-project_name: nb2337
-project_leader: 罗伟
-template_file_name: 2017WWXX周工作报告样本.doc
+project_name: [nb2337,nb2353]
+project_leader: [罗伟,何进]
+template_file_name: 2017WWXX周工作报告样本.doc
\ No newline at end of file
diff --git a/gen_word.py b/gen_word.py
index 7a343ee..7a8cafc 100644
--- a/gen_word.py
+++ b/gen_word.py
@@ -79,10 +79,10 @@ class WEEK_REPORT:
         table.Cell(Row=1, Column=4).Range.Text = self.str
 
         # 所在项目
-        table.Cell(Row=2, Column=2).Range.Text = self.project_name
+        table.Cell(Row=2, Column=2).Range.Text = "、".join(self.project_name)
 
         # 项目负责人
-        table.Cell(Row=2, Column=4).Range.Text = self.project_leader
+        table.Cell(Row=2, Column=4).Range.Text = "、".join(self.project_leader)
 
         # 报告人
         table.Cell(Row=3, Column=2).Range.Text = self.user_name
@@ -94,10 +94,10 @@ class WEEK_REPORT:
             table.Cell(Row=i, Column=3).Range.Text = ''
         
         # 额外工作记录
-        table.Cell(Row=13, Column=1).Range.Text = '1，周一：'
+        table.Cell(Row=13, Column=1).Range.Text = ''
 
         # 工作完成情况
-        table.Cell(Row=15, Column=1).Range.Text = "项目工作：\n{}\n1，\n其他（非项目工作）\n\n".format(self.project_name)
+        table.Cell(Row=15, Column=1).Range.Text = "\n".join(["{}（？%）".format(i) for i in self.project_name])
 
         # 困难问题、经验教训及建议
         table.Cell(Row=17, Column=1).Range.Text = ''