From 033885bbff2cd2a3e9e86a22dee86ce9705e399e Mon Sep 17 00:00:00 2001
From: wangweiye7840 <kj_wangweiye@126.com>
Date: Tue, 11 Jul 2023 15:04:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9F=BA=E7=A1=80=E7=9F=A5?=
 =?UTF-8?q?=E8=AF=86=E6=A2=B3=E7=90=86=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E5=AF=B9database=5Ftools=E4=B8=AD?=
 =?UTF-8?q?=E5=A4=87=E8=AF=BE=E8=AE=B2=E4=B9=89=E7=9A=84=E4=BA=A7=E7=94=9F?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BD=9C=E4=BA=86=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 工具v2/database_tools.py      |  2 +-
 工具v2/学生讲义制作.py        | 10 +++++-----
 工具v2/文本文件/课时题目.json | 13 +++++++++++++
 题库0.3/BasicKnowledge.json   | 12 ++++++++----
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/工具v2/database_tools.py b/工具v2/database_tools.py
index 7c21b6b0..0ccb2896 100644
--- a/工具v2/database_tools.py
+++ b/工具v2/database_tools.py
@@ -889,7 +889,7 @@ def GenerateLessonPreparation(notetitle, outputdir, adict, prodict, objdict, les
         output += "\\subsection{双基梳理}\n\n"
         basic_body = ""
         for bnid in basicknowledgedict:
-            if basicknowledgedict[bnid]["obj"].startswith(lid):
+            if basicknowledgedict[bnid]["lesson"] == lid:
                 basic_body += "\\item %s\n\n"%basicknowledgedict[bnid]["content"]
         output += "\\begin{enumerate}\n\n %s\n\n\\end{enumerate}\n\n"%(basic_body if basic_body != "" else "\\item 暂无")
         problems_list = adict[lid]
diff --git a/工具v2/学生讲义制作.py b/工具v2/学生讲义制作.py
index d5687fc4..2192356d 100644
--- a/工具v2/学生讲义制作.py
+++ b/工具v2/学生讲义制作.py
@@ -1,9 +1,9 @@
-notetitle = "测试讲义" #讲义标题, 也是文件标题
-problems = ["1:10","20:25","20001:20005"] #题号列表, 每个字符串表示一个分块的题目
-sectiontitles = ["课前","课后","附加"] #小节标题列表, 如果与题号列表长度不符则作为不设小节处理
+notetitle = "高一年级第一学期教材复习题" #讲义标题, 也是文件标题
+problems = ["1:19","20:47","48:60","61:75","76:94","306:325"] #题号列表, 每个字符串表示一个分块的题目
+sectiontitles = ["集合与逻辑","等式与不等式","幂、指数与对数","幂函数、指数函数与对数函数","函数的概念、性质及应用","数列"] #小节标题列表, 如果与题号列表长度不符则作为不设小节处理
 consecutivenumbering = True #不同小节是否连续编号, True表示连续编号, False表示每小节从1开始编号
-answered = True #是否展示答案, True表示展示答案, False表示不展示答案
-spaceflag = False #是否留空格, True表示留空格, False表示不留空格
+answered = False #是否展示答案, True表示展示答案, False表示不展示答案
+spaceflag = True #是否留空格, True表示留空格, False表示不留空格
 
 
 
diff --git a/工具v2/文本文件/课时题目.json b/工具v2/文本文件/课时题目.json
index b08f2d04..8900196e 100644
--- a/工具v2/文本文件/课时题目.json
+++ b/工具v2/文本文件/课时题目.json
@@ -6,6 +6,19 @@
     "K0105": "011766:011771,011783,009437:009439,010030:010032,010036,020070:020075,020090",
     "K0106": "011772:011775,009440:009441,010033:010035,010037:010039,000003,000008:000009,000012,020076:020086,020091,030001",
     "K0107": "011776:011782,009442:009444,000010,000017:000018,020087:020089,020092:020096",
+    "K0108":"11783:11790,9444:9446,10040:10041,20097:20104,20162:20163",
+    "K0109":"11791:11796,9447:9448,10042:10045,10058:10062,20105:20114,20134:20135,20,33,34,20148,10070:10071,10074",
+    "K0110":"11797:11803,9449:9451,10046,10048,10050,10063,21:22,20115,20125",
+    "K0111":"11804:11809,9451:9452,10047:10049,10051:10056,10064:10065,43,20116:20133,20178,20219:20224",
+    "K0112":"11810:11811,10066:10067,10078,10080:10081,23,35,20136:20143,20179,9453,10073",
+    "K0113":"11812:11816,9454:9455,10068,10072,10082,24,47,20145:20147,20180,20182",
+    "K0114":"11817:11821,9456:9458,10069,10072:10073,25:26,20156:20158,10076,20150,20152",
+    "K0115":"11822:11828,9458:9460,10075,10083,10087:10088,28,45,20149,20151,20153:20155,20158:20160,20181,20183",
+    "K0116":"11829:11834,9461,10077,10084:10085,27,36,37,44,20161,20164:20167,20184",
+    "K0117":"11835:11840,9462,10079,10086,29,36,37,44,20168:20177",
+    "K0118":"11841:11845,9463:9464,10089:10093,10097:10100,30,40,20186:20201",
+    "K0119":"11846:11850,9465:9466,10094,31:32,38,39,41,46,20202:20211,20225:20226",
+    "K0120":"11851:11855,9467:9468,100951:10096,10101:10104,42,20213:20218",
     "K0201": "011856:011859,011864,009469:009471,010105,010106,010112,020352,020358:020360,020362,020366,020370",
     "K0202": "011860,011861,009472,009473,010107:010110,010113,020353:020356,020363,020364,020367",
     "K0203": "011862:011863,009474,009475,010111,010114,000050,000051,000057,000058,020357,020361,020365,020368,020371",
diff --git a/题库0.3/BasicKnowledge.json b/题库0.3/BasicKnowledge.json
index 29788111..f3eda8c5 100644
--- a/题库0.3/BasicKnowledge.json
+++ b/题库0.3/BasicKnowledge.json
@@ -1,18 +1,22 @@
 {
     "B00001": {
-        "obj": "K0101001B",
+        "lesson": "K0101",
+        "obj": ["K0101001B"],
         "content": "集合的概念\\\\\n(1) 集合的概念: 把一些确定的对象的\\blank{50}叫做集合, 简称集.\\\\\n(2) 集合的元素: 集合所含的各个\\blank{50}叫做这个集合的元素.\\\\\n(3) 集合中各个元素是\\blank{50}, 即一个元素在同一个集合中不能重复出现."
     },
     "B00002": {
-        "obj": "K0101001B",
+        "lesson": "K0101",
+        "obj": ["K0101001B"],
         "content": "元素和集合的关系\\\\\n集合通常用大写字母$A$、$B$、$C$、$\\cdots$表示, 集合中的元素通常用小写字母$a$、$b$、$c$、$\\cdots$表示. 若$a$是集合$A$的元素, 则记作``\\blank{50}''; 若$a$不是集合$A$的元素, 则记作``\\blank{50}''."
     },
     "B00003": {
-        "obj": "K0101003B",
+        "lesson": "K0101",
+        "obj": ["K0101003B"],
         "content": "常用数集及其记法\\\\\n数的集合简称数集, 我们把常用的数集用特定的字母表示:\\\\\n自然数集\\blank{20}, 整数集\\blank{20}, 有理数集\\blank{20}, 实数集\\blank{20}."
     },
     "B00004": {
-        "obj": "K0101002B",
+        "lesson": "K0101",
+        "obj": ["K0101002B"],
         "content": "集合的分类\\\\\n(1) 有限集: 含有\\blank{50}元素的集合称为有限集.\\\\\n(2) 无限集: 含有\\blank{50}元素的集合称为无限集.\\\\\n规定: \\blank{100}的集合称为空集, 记作\\blank{20}."
     }
 }
\ No newline at end of file