tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化的题目查询的速度，题目交卷结果另外保存

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent 312bb86bfe
commit 3f7b4f74d5
21 changed files with 687 additions and 253 deletions
Show Stats Download Patch File Download Diff File

171
data_base_design/天泽数据大平台.pdb
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1670172135" Name="cjks" Objects="1348" Symbols="103" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1670217067" Name="cjks" Objects="1336" Symbols="103" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -4256,8 +4256,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o13">
<a:CreationDate>1661955336</a:CreationDate>
<a:ModificationDate>1665583780</a:ModificationDate>
<a:Rect>((256786,18784), (283349,23359))</a:Rect>
<a:ListOfPoints>((256786,18784),(256786,23059),(283349,23059))</a:ListOfPoints>
<a:Rect>((256786,18784), (282577,22948))</a:Rect>
<a:ListOfPoints>((256786,18784),(256786,22648),(282577,22648))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4298,8 +4298,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o20">
<a:CreationDate>1661960819</a:CreationDate>
<a:ModificationDate>1665721097</a:ModificationDate>
<a:Rect>((306535,27557), (308088,41939))</a:Rect>
<a:ListOfPoints>((308088,41939),(308088,34338),(306835,34338),(306835,27557))</a:ListOfPoints>
<a:Rect>((307225,27523), (308081,41925))</a:Rect>
<a:ListOfPoints>((308081,41925),(308081,34338),(307525,34338),(307525,27523))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4360,8 +4360,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o30">
<a:CreationDate>1662020600</a:CreationDate>
<a:ModificationDate>1665583741</a:ModificationDate>
<a:Rect>((299321,8474), (327394,24009))</a:Rect>
<a:ListOfPoints>((327394,8474),(327394,23709),(299321,23709))</a:ListOfPoints>
<a:Rect>((299543,8474), (327394,23653))</a:Rect>
<a:ListOfPoints>((327394,8474),(327394,23353),(299543,23353))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4381,8 +4381,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o33">
<a:CreationDate>1662046228</a:CreationDate>
<a:ModificationDate>1665583791</a:ModificationDate>
<a:Rect>((307176,17357), (307776,27594))</a:Rect>
<a:ListOfPoints>((307476,17357),(307476,27594))</a:ListOfPoints>
<a:Rect>((307541,17357), (308141,27563))</a:Rect>
<a:ListOfPoints>((307841,17357),(307841,27563))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4402,8 +4402,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o36">
<a:CreationDate>1662047541</a:CreationDate>
<a:ModificationDate>1669389792</a:ModificationDate>
<a:Rect>((250179,30679), (296891,31279))</a:Rect>
<a:ListOfPoints>((250179,31234),(278057,31234),(278057,30979),(296891,30979))</a:ListOfPoints>
<a:Rect>((250179,30932), (296962,31532))</a:Rect>
<a:ListOfPoints>((250179,31234),(278057,31234),(278057,31232),(296962,31232))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4423,8 +4423,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o39">
<a:CreationDate>1662048005</a:CreationDate>
<a:ModificationDate>1662048061</a:ModificationDate>
<a:Rect>((230014,25645), (295754,28276))</a:Rect>
<a:ListOfPoints>((230014,28276),(230014,25945),(295754,25945))</a:ListOfPoints>
<a:Rect>((230014,25476), (295754,28276))</a:Rect>
<a:ListOfPoints>((230014,28276),(230014,25776),(295754,25776))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4444,8 +4444,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o42">
<a:CreationDate>1662647833</a:CreationDate>
<a:ModificationDate>1665821828</a:ModificationDate>
<a:Rect>((276450,14759), (285780,27627))</a:Rect>
<a:ListOfPoints>((276450,14759),(276450,20457),(285480,20457),(285480,27627))</a:ListOfPoints>
<a:Rect>((276450,14759), (285141,27599))</a:Rect>
<a:ListOfPoints>((276450,14759),(276450,20457),(284841,20457),(284841,27599))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4483,8 +4483,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o48">
<a:CreationDate>1662810688</a:CreationDate>
<a:ModificationDate>1665583748</a:ModificationDate>
<a:Rect>((296364,29311), (338850,29911))</a:Rect>
<a:ListOfPoints>((338850,29545),(319044,29545),(319044,29611),(296364,29611))</a:ListOfPoints>
<a:Rect>((296402,29450), (338850,30050))</a:Rect>
<a:ListOfPoints>((338850,29545),(319044,29545),(319044,29750),(296402,29750))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4504,8 +4504,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o50">
<a:CreationDate>1662865795</a:CreationDate>
<a:ModificationDate>1665583789</a:ModificationDate>
<a:Rect>((291944,17344), (294094,23652))</a:Rect>
<a:ListOfPoints>((291944,17344),(291944,20313),(293794,20313),(293794,23652))</a:ListOfPoints>
<a:Rect>((291944,17344), (293972,23291))</a:Rect>
<a:ListOfPoints>((291944,17344),(291944,20313),(293672,20313),(293672,23291))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4525,8 +4525,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o53">
<a:CreationDate>1664451291</a:CreationDate>
<a:ModificationDate>1664451291</a:ModificationDate>
<a:Rect>((241793,17863), (285705,26950))</a:Rect>
<a:ListOfPoints>((241793,17863),(241793,26650),(285705,26650))</a:ListOfPoints>
<a:Rect>((242131,17940), (285080,26840))</a:Rect>
<a:ListOfPoints>((242131,17940),(242131,26540),(285080,26540))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4545,8 +4545,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o56">
<a:CreationDate>1664451372</a:CreationDate>
<a:ModificationDate>1664451372</a:ModificationDate>
<a:Rect>((206554,6793), (234167,18440))</a:Rect>
<a:ListOfPoints>((206554,6793),(206554,18140),(234167,18140))</a:ListOfPoints>
<a:Rect>((206635,6900), (234040,18540))</a:Rect>
<a:ListOfPoints>((206635,6900),(206635,18240),(234040,18240))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4565,8 +4565,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o59">
<a:CreationDate>1664453932</a:CreationDate>
<a:ModificationDate>1664453932</a:ModificationDate>
<a:Rect>((234482,-16351), (248094,15764))</a:Rect>
<a:ListOfPoints>((248094,-16351),(234782,-16351),(234782,15764))</a:ListOfPoints>
<a:Rect>((234393,-16131), (248070,15668))</a:Rect>
<a:ListOfPoints>((248070,-16131),(234693,-16131),(234693,15668))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4585,8 +4585,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o62">
<a:CreationDate>1664461421</a:CreationDate>
<a:ModificationDate>1665583791</a:ModificationDate>
<a:Rect>((309993,-15970), (310730,7879))</a:Rect>
<a:ListOfPoints>((310730,-15970),(310730,560),(310293,560),(310293,7879))</a:ListOfPoints>
<a:Rect>((309993,-15930), (310593,7879))</a:Rect>
<a:ListOfPoints>((310222,-15930),(310222,560),(310293,560),(310293,7879))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4626,8 +4626,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o69">
<a:CreationDate>1664952224</a:CreationDate>
<a:ModificationDate>1669988284</a:ModificationDate>
<a:Rect>((269308,32708), (287397,45668))</a:Rect>
<a:ListOfPoints>((269308,45668),(287097,45668),(287097,32708))</a:ListOfPoints>
<a:Rect>((269308,33106), (286858,45668))</a:Rect>
<a:ListOfPoints>((269308,45668),(286558,45668),(286558,33106))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4647,8 +4647,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o71">
<a:CreationDate>1666620846</a:CreationDate>
<a:ModificationDate>1666620846</a:ModificationDate>
<a:Rect>((204737,-10592), (205337,542))</a:Rect>
<a:ListOfPoints>((205037,-10592),(205037,542))</a:ListOfPoints>
<a:Rect>((204773,-10560), (205373,120))</a:Rect>
<a:ListOfPoints>((205073,-10560),(205073,120))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4688,7 +4688,7 @@ Shadow=0</a:DisplayPreferences>
<a:CreationDate>1623769194</a:CreationDate>
<a:ModificationDate>1669987509</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-8695,51363), (5699,66285))</a:Rect>
<a:Rect>((-9119,50726), (6123,66922))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4713,7 +4713,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623769937</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-8567,11553), (5827,25651))</a:Rect>
<a:Rect>((-8991,10954), (6251,26250))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4765,7 +4765,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623770338</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-8519,-13745), (5875,-473))</a:Rect>
<a:Rect>((-8943,-14307), (6299,89))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4844,7 +4844,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623826338</a:CreationDate>
<a:ModificationDate>1669987509</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((42101,49703), (67309,57201))</a:Rect>
<a:Rect>((41316,49404), (68094,57500))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4869,7 +4869,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828456</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((9860,2297), (33524,17219))</a:Rect>
<a:Rect>((9127,1660), (34257,17856))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4894,7 +4894,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828633</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((11925,-9983), (30567,-835))</a:Rect>
<a:Rect>((11359,-10357), (31133,-461))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4919,7 +4919,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828682</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((11692,-23952), (30334,-14804))</a:Rect>
<a:Rect>((11126,-24326), (30900,-14430))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4944,7 +4944,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828725</a:CreationDate>
<a:ModificationDate>1668414750</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((9478,-37544), (33142,-27572))</a:Rect>
<a:Rect>((8745,-37956), (33875,-27160))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4969,7 +4969,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828770</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((15482,19145), (32966,34893))</a:Rect>
<a:Rect>((14955,18471), (33493,35567))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4994,7 +4994,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623840859</a:CreationDate>
<a:ModificationDate>1669343782</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((38474,-23522), (54026,-10250))</a:Rect>
<a:Rect>((38011,-24084), (54489,-9688))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5019,7 +5019,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623841366</a:CreationDate>
<a:ModificationDate>1669343782</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((38351,-38151), (53903,-24879))</a:Rect>
<a:Rect>((37888,-38713), (54366,-24317))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5044,7 +5044,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623842834</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((73515,34605), (94861,71803))</a:Rect>
<a:Rect>((72859,32956), (95517,73452))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5069,7 +5069,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623845173</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((97714,50128), (123308,65876))</a:Rect>
<a:Rect>((96916,49454), (124106,66550))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5094,7 +5094,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623845296</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((97012,38528), (114110,47676))</a:Rect>
<a:Rect>((96498,38154), (114624,48050))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5119,7 +5119,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623859429</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((126351,49974), (150015,66546))</a:Rect>
<a:Rect>((125618,49262), (150748,67258))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5144,7 +5144,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623859834</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((126448,37699), (145090,47671))</a:Rect>
<a:Rect>((125882,37287), (145656,48083))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5196,7 +5196,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623860248</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((76512,-37814), (95540,-22066))</a:Rect>
<a:Rect>((75933,-38488), (96119,-21392))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5221,7 +5221,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623860509</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((97418,-37601), (112584,-22679))</a:Rect>
<a:Rect>((96968,-38238), (113034,-22042))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5246,7 +5246,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861067</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((114819,9099), (138483,25671))</a:Rect>
<a:Rect>((114086,8387), (139216,26383))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5271,7 +5271,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861149</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((117630,-4251), (136272,5721))</a:Rect>
<a:Rect>((117064,-4663), (136838,6133))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5296,7 +5296,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861203</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((141097,-4531), (155105,7917))</a:Rect>
<a:Rect>((140686,-5055), (155516,8441))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5321,7 +5321,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861290</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((117330,-17151), (135972,-7179))</a:Rect>
<a:Rect>((116764,-17563), (136538,-6767))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5373,7 +5373,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623862594</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((57999,-26039), (69689,-15241))</a:Rect>
<a:Rect>((57665,-26488), (70023,-14792))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5398,7 +5398,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623862978</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-35612,-12014), (-10790,434))</a:Rect>
<a:Rect>((-36384,-12538), (-10018,958))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5423,7 +5423,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623863676</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-42967,-23001), (-31277,-14679))</a:Rect>
<a:Rect>((-43301,-23338), (-30943,-14342))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5448,7 +5448,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623864141</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-28700,-23001), (-10830,-14679))</a:Rect>
<a:Rect>((-29240,-23338), (-10290,-14342))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5473,7 +5473,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623895431</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-56781,-22851), (-45091,-14529))</a:Rect>
<a:Rect>((-57115,-23188), (-44757,-14192))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5498,7 +5498,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1625926250</a:CreationDate>
<a:ModificationDate>1668414750</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((43567,29349), (65685,45921))</a:Rect>
<a:Rect>((42885,28637), (66367,46633))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5523,7 +5523,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1627129933</a:CreationDate>
<a:ModificationDate>1669987509</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((98192,67576), (113358,74248))</a:Rect>
<a:Rect>((97742,67314), (113808,74510))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5548,7 +5548,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628307450</a:CreationDate>
<a:ModificationDate>1668414750</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-42268,-32406), (-32124,-25734))</a:Rect>
<a:Rect>((-42551,-32668), (-31841,-25472))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5573,7 +5573,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628307767</a:CreationDate>
<a:ModificationDate>1668414750</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-29099,-35369), (-10843,-24571))</a:Rect>
<a:Rect>((-29652,-35818), (-10290,-24122))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5598,7 +5598,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628340137</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((38226,20835), (49324,25857))</a:Rect>
<a:Rect>((37876,20648), (49674,26044))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5623,7 +5623,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1631242896</a:CreationDate>
<a:ModificationDate>1668414750</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-7135,-34940), (3783,-26618))</a:Rect>
<a:Rect>((-7443,-35277), (4091,-26281))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5648,7 +5648,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1631243538</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-7060,-23278), (3858,-15780))</a:Rect>
<a:Rect>((-7368,-23577), (4166,-15481))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5673,7 +5673,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661850632</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((296563,50207), (319841,63479))</a:Rect>
<a:Rect>((295843,49645), (320561,64041))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5725,7 +5725,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661949359</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((283343,22147), (308165,33769))</a:Rect>
<a:Rect>((282571,21660), (308937,34256))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5885,7 +5885,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661960474</a:CreationDate>
<a:ModificationDate>1668414750</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((289997,35470), (326407,48742))</a:Rect>
<a:Rect>((288839,34908), (327565,49304))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6315,7 +6315,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1664366421</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((226736,11944), (245764,21917))</a:Rect>
<a:Rect>((226157,11532), (246343,22329))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6340,7 +6340,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1664367261</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((241300,-25979), (255694,-11882))</a:Rect>
<a:Rect>((240876,-26579), (256118,-11282))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6365,7 +6365,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1664368015</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((195894,-1109), (214536,12164))</a:Rect>
<a:Rect>((195328,-1671), (215102,12726))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6390,7 +6390,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1664460832</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((307694,-30483), (330198,-2360))</a:Rect>
<a:Rect>((306999,-31720), (330893,-1123))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6442,7 +6442,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1666620383</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((196964,-16379), (210198,-5582))</a:Rect>
<a:Rect>((196578,-16829), (210584,-5132))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6467,7 +6467,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1666665914</a:CreationDate>
<a:ModificationDate>1669377987</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((416389,31906), (440053,47654))</a:Rect>
<a:Rect>((415656,31232), (440786,48328))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6492,7 +6492,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1666667664</a:CreationDate>
<a:ModificationDate>1669377987</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((416023,12840), (438141,30238))</a:Rect>
<a:Rect>((415341,12091), (438823,30987))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6571,7 +6571,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1667489810</a:CreationDate>
<a:ModificationDate>1669377987</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((415699,-322), (439363,10476))</a:Rect>
<a:Rect>((414966,-771), (440096,10925))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6596,7 +6596,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1667535250</a:CreationDate>
<a:ModificationDate>1668414750</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((57784,-40851), (71404,-27579))</a:Rect>
<a:Rect>((57385,-41413), (71803,-27017))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6621,7 +6621,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1668411425</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((170865,-10239), (184963,-266))</a:Rect>
<a:Rect>((170415,-10651), (185413,146))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6646,7 +6646,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1669343797</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((72210,-15914), (97032,1484))</a:Rect>
<a:Rect>((71438,-16663), (97804,2233))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6725,7 +6725,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1669344473</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((231458,66429), (255122,83001))</a:Rect>
<a:Rect>((230725,65717), (255855,83713))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6748,9 +6748,9 @@ LABL 0 新宋体,8,N</a:FontList>
</o:TableSymbol>
<o:TableSymbol Id="o215">
<a:CreationDate>1669986324</a:CreationDate>
<a:ModificationDate>1670172135</a:ModificationDate>
<a:ModificationDate>1670172137</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((255845,64095), (280211,84151))</a:Rect>
<a:Rect>((255995,64770), (280361,84826))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:ShadowStyle>1</a:ShadowStyle>
<a:LineColor>12615680</a:LineColor>
@ -20965,10 +20965,11 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Code>question_setting_type</a:Code>
<a:CreationDate>1664182126</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1669987509</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:ModificationDate>1670217067</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:Comment>类型 枚举（ResourcesQuestionSnapshotFromTypeEnum）</a:Comment>
<a:DataType>bigint</a:DataType>
<a:DataType>varchar(50)</a:DataType>
<a:Length>50</a:Length>
</o:Column>
<o:Column Id="o1274">
<a:ObjectID>79047956-FCCE-482C-A7FC-8EF8D94E329C</a:ObjectID>

220
data_base_design/天泽数据大平台.pdm
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1670172137" Name="cjks" Objects="1348" Symbols="103" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1670218115" Name="cjks" Objects="1337" Symbols="103" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -4256,8 +4256,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o13">
<a:CreationDate>1661955336</a:CreationDate>
<a:ModificationDate>1665583780</a:ModificationDate>
<a:Rect>((256786,18784), (283349,23359))</a:Rect>
<a:ListOfPoints>((256786,18784),(256786,23059),(283349,23059))</a:ListOfPoints>
<a:Rect>((256786,18784), (282577,22948))</a:Rect>
<a:ListOfPoints>((256786,18784),(256786,22648),(282577,22648))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4298,8 +4298,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o20">
<a:CreationDate>1661960819</a:CreationDate>
<a:ModificationDate>1665721097</a:ModificationDate>
<a:Rect>((306535,27557), (308088,41939))</a:Rect>
<a:ListOfPoints>((308088,41939),(308088,34338),(306835,34338),(306835,27557))</a:ListOfPoints>
<a:Rect>((307225,27523), (308081,41925))</a:Rect>
<a:ListOfPoints>((308081,41925),(308081,34338),(307525,34338),(307525,27523))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4360,8 +4360,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o30">
<a:CreationDate>1662020600</a:CreationDate>
<a:ModificationDate>1665583741</a:ModificationDate>
<a:Rect>((299321,8474), (327394,24009))</a:Rect>
<a:ListOfPoints>((327394,8474),(327394,23709),(299321,23709))</a:ListOfPoints>
<a:Rect>((299543,8474), (327394,23653))</a:Rect>
<a:ListOfPoints>((327394,8474),(327394,23353),(299543,23353))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4381,8 +4381,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o33">
<a:CreationDate>1662046228</a:CreationDate>
<a:ModificationDate>1665583791</a:ModificationDate>
<a:Rect>((307176,17357), (307776,27594))</a:Rect>
<a:ListOfPoints>((307476,17357),(307476,27594))</a:ListOfPoints>
<a:Rect>((307541,17357), (308141,27563))</a:Rect>
<a:ListOfPoints>((307841,17357),(307841,27563))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4402,8 +4402,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o36">
<a:CreationDate>1662047541</a:CreationDate>
<a:ModificationDate>1669389792</a:ModificationDate>
<a:Rect>((250179,30679), (296891,31279))</a:Rect>
<a:ListOfPoints>((250179,31234),(278057,31234),(278057,30979),(296891,30979))</a:ListOfPoints>
<a:Rect>((250179,30932), (296962,31532))</a:Rect>
<a:ListOfPoints>((250179,31234),(278057,31234),(278057,31232),(296962,31232))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4423,8 +4423,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o39">
<a:CreationDate>1662048005</a:CreationDate>
<a:ModificationDate>1662048061</a:ModificationDate>
<a:Rect>((230014,25645), (295754,28276))</a:Rect>
<a:ListOfPoints>((230014,28276),(230014,25945),(295754,25945))</a:ListOfPoints>
<a:Rect>((230014,25476), (295754,28276))</a:Rect>
<a:ListOfPoints>((230014,28276),(230014,25776),(295754,25776))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4444,8 +4444,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o42">
<a:CreationDate>1662647833</a:CreationDate>
<a:ModificationDate>1665821828</a:ModificationDate>
<a:Rect>((276450,14759), (285780,27627))</a:Rect>
<a:ListOfPoints>((276450,14759),(276450,20457),(285480,20457),(285480,27627))</a:ListOfPoints>
<a:Rect>((276450,14759), (285141,27599))</a:Rect>
<a:ListOfPoints>((276450,14759),(276450,20457),(284841,20457),(284841,27599))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4483,8 +4483,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o48">
<a:CreationDate>1662810688</a:CreationDate>
<a:ModificationDate>1665583748</a:ModificationDate>
<a:Rect>((296364,29311), (338850,29911))</a:Rect>
<a:ListOfPoints>((338850,29545),(319044,29545),(319044,29611),(296364,29611))</a:ListOfPoints>
<a:Rect>((296402,29450), (338850,30050))</a:Rect>
<a:ListOfPoints>((338850,29545),(319044,29545),(319044,29750),(296402,29750))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4504,8 +4504,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o50">
<a:CreationDate>1662865795</a:CreationDate>
<a:ModificationDate>1665583789</a:ModificationDate>
<a:Rect>((291944,17344), (294094,23652))</a:Rect>
<a:ListOfPoints>((291944,17344),(291944,20313),(293794,20313),(293794,23652))</a:ListOfPoints>
<a:Rect>((291944,17344), (293972,23291))</a:Rect>
<a:ListOfPoints>((291944,17344),(291944,20313),(293672,20313),(293672,23291))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4525,8 +4525,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o53">
<a:CreationDate>1664451291</a:CreationDate>
<a:ModificationDate>1664451291</a:ModificationDate>
<a:Rect>((241793,17863), (285705,26950))</a:Rect>
<a:ListOfPoints>((241793,17863),(241793,26650),(285705,26650))</a:ListOfPoints>
<a:Rect>((242131,17940), (285080,26840))</a:Rect>
<a:ListOfPoints>((242131,17940),(242131,26540),(285080,26540))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4545,8 +4545,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o56">
<a:CreationDate>1664451372</a:CreationDate>
<a:ModificationDate>1664451372</a:ModificationDate>
<a:Rect>((206554,6793), (234167,18440))</a:Rect>
<a:ListOfPoints>((206554,6793),(206554,18140),(234167,18140))</a:ListOfPoints>
<a:Rect>((206635,6900), (234040,18540))</a:Rect>
<a:ListOfPoints>((206635,6900),(206635,18240),(234040,18240))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4565,8 +4565,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o59">
<a:CreationDate>1664453932</a:CreationDate>
<a:ModificationDate>1664453932</a:ModificationDate>
<a:Rect>((234482,-16351), (248094,15764))</a:Rect>
<a:ListOfPoints>((248094,-16351),(234782,-16351),(234782,15764))</a:ListOfPoints>
<a:Rect>((234393,-16131), (248070,15668))</a:Rect>
<a:ListOfPoints>((248070,-16131),(234693,-16131),(234693,15668))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4585,8 +4585,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o62">
<a:CreationDate>1664461421</a:CreationDate>
<a:ModificationDate>1665583791</a:ModificationDate>
<a:Rect>((309993,-15970), (310730,7879))</a:Rect>
<a:ListOfPoints>((310730,-15970),(310730,560),(310293,560),(310293,7879))</a:ListOfPoints>
<a:Rect>((309993,-15930), (310593,7879))</a:Rect>
<a:ListOfPoints>((310222,-15930),(310222,560),(310293,560),(310293,7879))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4626,8 +4626,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o69">
<a:CreationDate>1664952224</a:CreationDate>
<a:ModificationDate>1669988284</a:ModificationDate>
<a:Rect>((269308,32708), (287397,45668))</a:Rect>
<a:ListOfPoints>((269308,45668),(287097,45668),(287097,32708))</a:ListOfPoints>
<a:Rect>((269308,33106), (286858,45668))</a:Rect>
<a:ListOfPoints>((269308,45668),(286558,45668),(286558,33106))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4647,8 +4647,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o71">
<a:CreationDate>1666620846</a:CreationDate>
<a:ModificationDate>1666620846</a:ModificationDate>
<a:Rect>((204737,-10592), (205337,542))</a:Rect>
<a:ListOfPoints>((205037,-10592),(205037,542))</a:ListOfPoints>
<a:Rect>((204773,-10560), (205373,120))</a:Rect>
<a:ListOfPoints>((205073,-10560),(205073,120))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4688,7 +4688,7 @@ Shadow=0</a:DisplayPreferences>
<a:CreationDate>1623769194</a:CreationDate>
<a:ModificationDate>1669987509</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-8695,51363), (5699,66285))</a:Rect>
<a:Rect>((-9119,50726), (6123,66922))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4713,7 +4713,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623769937</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-8567,11553), (5827,25651))</a:Rect>
<a:Rect>((-8991,10954), (6251,26250))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4765,7 +4765,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623770338</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-8519,-13745), (5875,-473))</a:Rect>
<a:Rect>((-8943,-14307), (6299,89))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4844,7 +4844,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623826338</a:CreationDate>
<a:ModificationDate>1669987509</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((42101,49703), (67309,57201))</a:Rect>
<a:Rect>((41316,49404), (68094,57500))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4869,7 +4869,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828456</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((9860,2297), (33524,17219))</a:Rect>
<a:Rect>((9127,1660), (34257,17856))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4894,7 +4894,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828633</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((11925,-9983), (30567,-835))</a:Rect>
<a:Rect>((11359,-10357), (31133,-461))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4919,7 +4919,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828682</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((11692,-23952), (30334,-14804))</a:Rect>
<a:Rect>((11126,-24326), (30900,-14430))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4944,7 +4944,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828725</a:CreationDate>
<a:ModificationDate>1668414750</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((9478,-37544), (33142,-27572))</a:Rect>
<a:Rect>((8745,-37956), (33875,-27160))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4969,7 +4969,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828770</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((15482,19145), (32966,34893))</a:Rect>
<a:Rect>((14955,18471), (33493,35567))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4994,7 +4994,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623840859</a:CreationDate>
<a:ModificationDate>1669343782</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((38474,-23522), (54026,-10250))</a:Rect>
<a:Rect>((38011,-24084), (54489,-9688))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5019,7 +5019,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623841366</a:CreationDate>
<a:ModificationDate>1669343782</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((38351,-38151), (53903,-24879))</a:Rect>
<a:Rect>((37888,-38713), (54366,-24317))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5044,7 +5044,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623842834</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((73515,34605), (94861,71803))</a:Rect>
<a:Rect>((72859,32956), (95517,73452))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5069,7 +5069,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623845173</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((97714,50128), (123308,65876))</a:Rect>
<a:Rect>((96916,49454), (124106,66550))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5094,7 +5094,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623845296</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((97012,38528), (114110,47676))</a:Rect>
<a:Rect>((96498,38154), (114624,48050))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5119,7 +5119,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623859429</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((126351,49974), (150015,66546))</a:Rect>
<a:Rect>((125618,49262), (150748,67258))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5144,7 +5144,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623859834</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((126448,37699), (145090,47671))</a:Rect>
<a:Rect>((125882,37287), (145656,48083))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5196,7 +5196,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623860248</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((76512,-37814), (95540,-22066))</a:Rect>
<a:Rect>((75933,-38488), (96119,-21392))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5221,7 +5221,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623860509</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((97418,-37601), (112584,-22679))</a:Rect>
<a:Rect>((96968,-38238), (113034,-22042))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5246,7 +5246,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861067</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((114819,9099), (138483,25671))</a:Rect>
<a:Rect>((114086,8387), (139216,26383))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5271,7 +5271,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861149</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((117630,-4251), (136272,5721))</a:Rect>
<a:Rect>((117064,-4663), (136838,6133))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5296,7 +5296,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861203</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((141097,-4531), (155105,7917))</a:Rect>
<a:Rect>((140686,-5055), (155516,8441))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5321,7 +5321,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861290</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((117330,-17151), (135972,-7179))</a:Rect>
<a:Rect>((116764,-17563), (136538,-6767))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5373,7 +5373,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623862594</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((57999,-26039), (69689,-15241))</a:Rect>
<a:Rect>((57665,-26488), (70023,-14792))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5398,7 +5398,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623862978</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-35612,-12014), (-10790,434))</a:Rect>
<a:Rect>((-36384,-12538), (-10018,958))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5423,7 +5423,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623863676</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-42967,-23001), (-31277,-14679))</a:Rect>
<a:Rect>((-43301,-23338), (-30943,-14342))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5448,7 +5448,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623864141</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-28700,-23001), (-10830,-14679))</a:Rect>
<a:Rect>((-29240,-23338), (-10290,-14342))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5473,7 +5473,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623895431</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-56781,-22851), (-45091,-14529))</a:Rect>
<a:Rect>((-57115,-23188), (-44757,-14192))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5498,7 +5498,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1625926250</a:CreationDate>
<a:ModificationDate>1668414750</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((43567,29349), (65685,45921))</a:Rect>
<a:Rect>((42885,28637), (66367,46633))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5523,7 +5523,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1627129933</a:CreationDate>
<a:ModificationDate>1669987509</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((98192,67576), (113358,74248))</a:Rect>
<a:Rect>((97742,67314), (113808,74510))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5548,7 +5548,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628307450</a:CreationDate>
<a:ModificationDate>1668414750</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-42268,-32406), (-32124,-25734))</a:Rect>
<a:Rect>((-42551,-32668), (-31841,-25472))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5573,7 +5573,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628307767</a:CreationDate>
<a:ModificationDate>1668414750</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-29099,-35369), (-10843,-24571))</a:Rect>
<a:Rect>((-29652,-35818), (-10290,-24122))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5598,7 +5598,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628340137</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((38226,20835), (49324,25857))</a:Rect>
<a:Rect>((37876,20648), (49674,26044))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5623,7 +5623,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1631242896</a:CreationDate>
<a:ModificationDate>1668414750</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-7135,-34940), (3783,-26618))</a:Rect>
<a:Rect>((-7443,-35277), (4091,-26281))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5648,7 +5648,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1631243538</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-7060,-23278), (3858,-15780))</a:Rect>
<a:Rect>((-7368,-23577), (4166,-15481))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5673,7 +5673,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661850632</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((296563,50207), (319841,63479))</a:Rect>
<a:Rect>((295843,49645), (320561,64041))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5725,7 +5725,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661949359</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((283343,22147), (308165,33769))</a:Rect>
<a:Rect>((282571,21660), (308937,34256))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5885,7 +5885,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661960474</a:CreationDate>
<a:ModificationDate>1668414750</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((289997,35470), (326407,48742))</a:Rect>
<a:Rect>((288839,34908), (327565,49304))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6315,7 +6315,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1664366421</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((226736,11944), (245764,21917))</a:Rect>
<a:Rect>((226157,11532), (246343,22329))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6340,7 +6340,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1664367261</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((241300,-25979), (255694,-11882))</a:Rect>
<a:Rect>((240876,-26579), (256118,-11282))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6365,7 +6365,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1664368015</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((195894,-1109), (214536,12164))</a:Rect>
<a:Rect>((195328,-1671), (215102,12726))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6390,7 +6390,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1664460832</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((307694,-30483), (330198,-2360))</a:Rect>
<a:Rect>((306999,-31720), (330893,-1123))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6442,7 +6442,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1666620383</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((196964,-16379), (210198,-5582))</a:Rect>
<a:Rect>((196578,-16829), (210584,-5132))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6467,7 +6467,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1666665914</a:CreationDate>
<a:ModificationDate>1669377987</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((416389,31906), (440053,47654))</a:Rect>
<a:Rect>((415656,31232), (440786,48328))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6492,7 +6492,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1666667664</a:CreationDate>
<a:ModificationDate>1669377987</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((416023,12840), (438141,30238))</a:Rect>
<a:Rect>((415341,12091), (438823,30987))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6571,7 +6571,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1667489810</a:CreationDate>
<a:ModificationDate>1669377987</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((415699,-322), (439363,10476))</a:Rect>
<a:Rect>((414966,-771), (440096,10925))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6596,7 +6596,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1667535250</a:CreationDate>
<a:ModificationDate>1668414750</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((57784,-40851), (71404,-27579))</a:Rect>
<a:Rect>((57385,-41413), (71803,-27017))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6621,7 +6621,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1668411425</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((170865,-10239), (184963,-266))</a:Rect>
<a:Rect>((170415,-10651), (185413,146))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6646,7 +6646,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1669343797</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((72210,-15914), (97032,1484))</a:Rect>
<a:Rect>((71438,-16663), (97804,2233))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6725,7 +6725,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1669344473</a:CreationDate>
<a:ModificationDate>1669700933</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((231458,66429), (255122,83001))</a:Rect>
<a:Rect>((230725,65717), (255855,83713))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -20915,8 +20915,8 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Code>question_log_summary</a:Code>
<a:CreationDate>1661850632</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1670172100</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:ModificationDate>1670218115</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:Comment>学生-题目日志-分析汇总</a:Comment>
<a:PhysicalOptions>auto_increment = 1
ENGINE = InnoDB
@ -20965,10 +20965,11 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Code>question_setting_type</a:Code>
<a:CreationDate>1664182126</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1669987509</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:ModificationDate>1670217067</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:Comment>类型 枚举（ResourcesQuestionSnapshotFromTypeEnum）</a:Comment>
<a:DataType>bigint</a:DataType>
<a:DataType>varchar(50)</a:DataType>
<a:Length>50</a:Length>
</o:Column>
<o:Column Id="o1274">
<a:ObjectID>79047956-FCCE-482C-A7FC-8EF8D94E329C</a:ObjectID>
@ -20994,6 +20995,17 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:DataType>float</a:DataType>
</o:Column>
<o:Column Id="o1276">
<a:ObjectID>5B85EBEA-89F7-49A2-88B8-F53C9DDF2778</a:ObjectID>
<a:Name>question_log_summary_student_total_score</a:Name>
<a:Code>question_log_summary_student_total_score</a:Code>
<a:CreationDate>1669987828</a:CreationDate>
<a:Creator>87966</a:Creator>
<a:ModificationDate>1670218115</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:Comment>学生总得分</a:Comment>
<a:DataType>float</a:DataType>
</o:Column>
<o:Column Id="o1277">
<a:ObjectID>B6F6BAB4-0EF0-4BE6-B661-74638716B0F8</a:ObjectID>
<a:Name>person_id</a:Name>
<a:Code>person_id</a:Code>
@ -21004,7 +21016,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>人员ID（学生ID等等）</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o1277">
<o:Column Id="o1278">
<a:ObjectID>425F40EA-F79E-409A-8C41-34C006D6D589</a:ObjectID>
<a:Name>question_log_ids</a:Name>
<a:Code>question_log_ids</a:Code>
@ -21016,7 +21028,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:DataType>varchar(2000)</a:DataType>
<a:Length>2000</a:Length>
</o:Column>
<o:Column Id="o1278">
<o:Column Id="o1279">
<a:ObjectID>2287A3B7-121E-41AE-87AC-FE935B55A80C</a:ObjectID>
<a:Name>question_log_summary_question_total_count</a:Name>
<a:Code>question_log_summary_question_total_count</a:Code>
@ -21027,7 +21039,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>配置的题目总数</a:Comment>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o1279">
<o:Column Id="o1280">
<a:ObjectID>9859472C-69C7-4E9A-9316-7BF0939E6BF2</a:ObjectID>
<a:Name>question_log_summary_student_do_count</a:Name>
<a:Code>question_log_summary_student_do_count</a:Code>
@ -21038,7 +21050,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>学生做题总数</a:Comment>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o1280">
<o:Column Id="o1281">
<a:ObjectID>B7EDC098-95AB-4219-9242-E644701913C4</a:ObjectID>
<a:Name>question_log_summary_success_count</a:Name>
<a:Code>question_log_summary_success_count</a:Code>
@ -21049,7 +21061,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>正确数量</a:Comment>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o1281">
<o:Column Id="o1282">
<a:ObjectID>109364AE-9C76-407B-934A-4307215E4982</a:ObjectID>
<a:Name>question_log_summary_error_count</a:Name>
<a:Code>question_log_summary_error_count</a:Code>
@ -21060,7 +21072,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>错误数量</a:Comment>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o1282">
<o:Column Id="o1283">
<a:ObjectID>4EEC3C67-2C8A-45F5-8540-A6FFFEA2968C</a:ObjectID>
<a:Name>question_log_summary_success_rate</a:Name>
<a:Code>question_log_summary_success_rate</a:Code>
@ -21071,7 +21083,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>正确率,最大100</a:Comment>
<a:DataType>float</a:DataType>
</o:Column>
<o:Column Id="o1283">
<o:Column Id="o1284">
<a:ObjectID>11D26CA6-CB55-43F0-9C8F-D1C07A6BC233</a:ObjectID>
<a:Name>question_log_summary_current_pass_rate</a:Name>
<a:Code>question_log_summary_current_pass_rate</a:Code>
@ -21082,7 +21094,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>当前配置的及格比率</a:Comment>
<a:DataType>float</a:DataType>
</o:Column>
<o:Column Id="o1284">
<o:Column Id="o1285">
<a:ObjectID>B7B56144-0CE8-4EA3-8315-C097AE2A2B4D</a:ObjectID>
<a:Name>question_log_summary_is_pass</a:Name>
<a:Code>question_log_summary_is_pass</a:Code>
@ -21094,7 +21106,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:DataType>int(2)</a:DataType>
<a:Length>2</a:Length>
</o:Column>
<o:Column Id="o1285">
<o:Column Id="o1286">
<a:ObjectID>45DBB89C-2AC0-4F71-AB87-1350950F054B</a:ObjectID>
<a:Name>finish_second_time</a:Name>
<a:Code>finish_second_time</a:Code>
@ -21105,7 +21117,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>完成用时(秒)</a:Comment>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o1286">
<o:Column Id="o1287">
<a:ObjectID>32BB73E0-CEAF-45BD-BC36-F699A354C8D7</a:ObjectID>
<a:Name>finish_time</a:Name>
<a:Code>finish_time</a:Code>
@ -21117,7 +21129,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:DataType>varchar(50)</a:DataType>
<a:Length>50</a:Length>
</o:Column>
<o:Column Id="o1287">
<o:Column Id="o1288">
<a:ObjectID>30F0DBA1-03FC-493E-B628-E3297D197E97</a:ObjectID>
<a:Name>question_log_summary_status</a:Name>
<a:Code>question_log_summary_status</a:Code>
@ -21129,7 +21141,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:DataType>int(2)</a:DataType>
<a:Length>2</a:Length>
</o:Column>
<o:Column Id="o1288">
<o:Column Id="o1289">
<a:ObjectID>5BDCBCAE-7982-49D0-91A7-2C51706D400F</a:ObjectID>
<a:Name>question_log_summary_add_time</a:Name>
<a:Code>question_log_summary_add_time</a:Code>
@ -21140,7 +21152,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>添加时间</a:Comment>
<a:DataType>datetime</a:DataType>
</o:Column>
<o:Column Id="o1289">
<o:Column Id="o1290">
<a:ObjectID>37755E03-C150-47C6-98C6-1BB69E36CAC1</a:ObjectID>
<a:Name>org_id</a:Name>
<a:Code>org_id</a:Code>
@ -21151,7 +21163,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>组织ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o1290">
<o:Column Id="o1291">
<a:ObjectID>9A38CEE4-E7F0-4393-8A46-7F0B8D2B44BD</a:ObjectID>
<a:Name>user_id</a:Name>
<a:Code>user_id</a:Code>
@ -21164,7 +21176,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Column>
</c:Columns>
<c:Keys>
<o:Key Id="o1291">
<o:Key Id="o1292">
<a:ObjectID>203F6632-947A-4CFA-815D-E029ACCFD264</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@ -21178,12 +21190,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Key>
</c:Keys>
<c:PrimaryKey>
<o:Key Ref="o1291"/>
<o:Key Ref="o1292"/>
</c:PrimaryKey>
</o:Table>
</c:Tables>
<c:DefaultGroups>
<o:Group Id="o1292">
<o:Group Id="o1293">
<a:ObjectID>BFEA4109-96F9-4074-AF58-B84D6574A7FC</a:ObjectID>
<a:Name>PUBLIC</a:Name>
<a:Code>PUBLIC</a:Code>
@ -21194,7 +21206,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Group>
</c:DefaultGroups>
<c:ChildTraceabilityLinks>
<o:ExtendedDependency Id="o1293">
<o:ExtendedDependency Id="o1294">
<a:ObjectID>ABEFC813-1056-4507-A9A7-809C149B4ABE</a:ObjectID>
<a:CreationDate>1661954753</a:CreationDate>
<a:Creator>lx</a:Creator>
@ -21482,7 +21494,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:ExtendedDependency>
</c:ChildTraceabilityLinks>
<c:TargetModels>
<o:TargetModel Id="o1294">
<o:TargetModel Id="o1295">
<a:ObjectID>5963E417-B2CE-431D-988A-B3493AAE5EE4</a:ObjectID>
<a:Name>MySQL 5.0</a:Name>
<a:Code>MYSQL50</a:Code>

3
doc/sql/mysql/tianze-pro-update.sql
Unescape Escape View File

@ -464,9 +464,10 @@ create table question_log_summary
question_log_summary_id bigint not null comment '学生做题日志汇总ID',
question_setting_id bigint comment '题目配置ID',
question_setting_name varchar(100) comment '题目配置名称',
question_setting_type bigint comment '类型 枚举（ResourcesQuestionSnapshotFromTypeEnum）',
question_setting_type varchar(50) comment '类型 枚举（ResourcesQuestionSnapshotFromTypeEnum）',
question_log_summary_from_type varchar(50) comment '来源类型 枚举',
question_setting_total_score float comment '配置的题目总分数',
question_log_summary_student_total_score float comment '学生总得分',
person_id bigint comment '人员ID（学生ID等等）',
question_log_ids varchar(2000) comment '关联的做题日志IDs',
question_log_summary_question_total_count int comment '配置的题目总数',

17
web/src/main/java/com/ibeetl/jlw/dao/GeneralResourcesQuestionSnapshotDao.java
Unescape Escape View File

@ -10,9 +10,12 @@ import org.beetl.sql.mapper.annotation.SqlResource;
import org.beetl.sql.mapper.annotation.Update;
import org.springframework.stereotype.Repository;
import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Map;
import static java.lang.Math.toIntExact;
/**
* 通用题目快照 Dao
*/
@ -46,4 +49,18 @@ public interface GeneralResourcesQuestionSnapshotDao extends BaseMapper<GeneralR
* @return
*/
PageQuery<GeneralQuestionTestSimpleInfoVO> getQuestionTestSimpleInfo(PageQuery query);
/**
* 功能描述: <br>
* 题目配置ID查询题目数量
*
* @Author: 87966
* @Date: 2022/12/5 13:47
*/
default int getQuestionTotalCountBySettingId(@NotNull Long questionSettingId) {
long count = createLambdaQuery().andEq(GeneralResourcesQuestionSnapshot::getGeneralQuestionSettingId, questionSettingId)
.andEq(GeneralResourcesQuestionSnapshot::getQuestionStatus, 1)
.count();
return toIntExact(count);
}
}

17
web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionSnapshotDao.java
Unescape Escape View File

@ -10,8 +10,11 @@ import org.beetl.sql.mapper.annotation.SqlResource;
import org.beetl.sql.mapper.annotation.Update;
import org.springframework.stereotype.Repository;
import javax.validation.constraints.NotNull;
import java.util.List;
import static java.lang.Math.toIntExact;
/**
* 题目快照 Dao
*/
@ -50,4 +53,18 @@ public interface ResourcesQuestionSnapshotDao extends BaseMapper<ResourcesQuesti
void deleteBySettingIds(String settingIds);
List<ResourcesQuestionSnapshot> getValuesByQueryNotWithPermission(ResourcesQuestionSnapshotQuery resourcesQuestionSnapshotQuery);
/**
* 功能描述: <br>
* 题目配置ID查询题目数量
*
* @Author: 87966
* @Date: 2022/12/5 13:47
*/
default int getQuestionTotalCountBySettingId(@NotNull Long questionSettingId) {
long count = createLambdaQuery().andEq(ResourcesQuestionSnapshot::getTeacherOpenCourseQuestionSettingId, questionSettingId)
.andEq(ResourcesQuestionSnapshot::getQuestionStatus, 1)
.count();
return toIntExact(count);
}
}

6
web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLog.java
Unescape Escape View File

@ -13,6 +13,8 @@ import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
/*
* 题库-通用做题日志
* gen by Spring Boot2 Admin 2022-11-24
@ -169,7 +171,7 @@ public class GeneralQuestionLog extends BaseEntity{
* @Date: 2022/12/4 20:39
*/
public Integer getSuccessCount() {
return Integer.valueOf(this.get("successCount").toString());
return Integer.valueOf(defaultIfNull(this.get("successCount"), "-1").toString());
}
/**
* 功能描述: <br>
@ -191,6 +193,6 @@ public class GeneralQuestionLog extends BaseEntity{
* @Date: 2022/12/4 20:39
*/
public Integer getErrorCount() {
return Integer.valueOf(this.get("errorCount").toString());
return Integer.valueOf(defaultIfNull(this.get("errorCount"), "-1").toString());
}
}

3
web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLogScoreInfo.java
Unescape Escape View File

@ -35,6 +35,9 @@ public class GeneralQuestionLogScoreInfo extends BaseEntity {
// 开课题目设置ID
private Long generalQuestionSettingId;
// 学生ID
private Long studentId;
// 查询指定的题目分数
private QuestionLogAddTypeEnum questionLogAddType;

64
web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLogScoreInfo1.java
Unescape Escape View File

@ -0,0 +1,64 @@
package com.ibeetl.jlw.entity;
import com.ibeetl.admin.core.annotation.DictDeep;
import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.jlw.enums.QuestionLogAddTypeEnum;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.beetl.sql.annotation.entity.Auto;
import org.beetl.sql.annotation.entity.Table;
import org.beetl.sql.fetch.annotation.Fetch;
import org.beetl.sql.fetch.annotation.FetchSql;
import java.util.List;
/**
* 我的课程-题库-做题日志-分数信息
* @author mlx
*/
@Data
@Fetch
@EqualsAndHashCode(callSuper=false)
@SuppressWarnings("ALL")
@Table(name = "general_question_log")
public class GeneralQuestionLogScoreInfo1 extends BaseEntity {
// BeetlSQL Fetch 对ID有要求，这里搞个占位字段
@Auto
private Long generalQuestionLogId ;
/** ========================================================================= */
/** ========== 这部分数据需要通过BeetlSQL来查询，才能自动触发FetchSql 注解 ========== */
// 开课题目设置ID
private Long generalQuestionSettingId;
// 学生ID
private Long studentId;
// 查询指定的题目分数
private QuestionLogAddTypeEnum questionLogAddType;
/** ========================================================================= */
/** ========================================================================= */
@FetchSql("select * from question_log_summary t " +
"where t.question_setting_id = #generalQuestionSettingId# " +
"and t.question_log_summary_status = 1 " +
"and t.person_id = #studentId# ")
@DictDeep
private QuestionLogSummary summaryInfo;
@FetchSql(value = "SELECT t.* " +
"FROM general_question_log t " +
"WHERE find_in_set(t.general_question_log_id, (" +
"select ta.question_log_ids from question_log_summary ta " +
"where ta.question_setting_id = #generalQuestionSettingId# " +
"and ta.question_log_summary_status = 1 " +
"and ta.person_id = #studentId# " +
")) "
)
private List<TeacherOpenCourseQuestionLog> questionLogList;
}

11
web/src/main/java/com/ibeetl/jlw/entity/QuestionLogSummary.java
Unescape Escape View File

@ -40,6 +40,9 @@ public class QuestionLogSummary extends BaseEntity{
private QuestionBusinessTypeEnum questionLogSummaryFromType ;
//学生总得分
private BigDecimal questionLogSummaryStudentTotalScore ;
//配置的题目总分数
private BigDecimal questionSettingTotalScore ;
@ -371,4 +374,12 @@ public class QuestionLogSummary extends BaseEntity{
public void setFinishTime(String finishTime) {
this.finishTime = finishTime;
}
public BigDecimal getQuestionLogSummaryStudentTotalScore() {
return questionLogSummaryStudentTotalScore;
}
public void setQuestionLogSummaryStudentTotalScore(BigDecimal questionLogSummaryStudentTotalScore) {
this.questionLogSummaryStudentTotalScore = questionLogSummaryStudentTotalScore;
}
}

6
web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java
Unescape Escape View File

@ -16,6 +16,8 @@ import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
/*
* 我的课程-题库-做题日志
* gen by Spring Boot2 Admin 2022-10-05
@ -182,7 +184,7 @@ public class TeacherOpenCourseQuestionLog extends BaseEntity {
* @Date: 2022/12/4 20:39
*/
public Integer getSuccessCount() {
return Integer.valueOf(this.get("successCount").toString());
return Integer.valueOf(defaultIfNull(this.get("successCount"), "-1").toString());
}
/**
* 功能描述: <br>
@ -204,6 +206,6 @@ public class TeacherOpenCourseQuestionLog extends BaseEntity {
* @Date: 2022/12/4 20:39
*/
public Integer getErrorCount() {
return Integer.valueOf(this.get("errorCount").toString());
return Integer.valueOf(defaultIfNull(this.get("errorCount"), "-1").toString());
}
}

64
web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogScoreInfo1.java
Unescape Escape View File

@ -0,0 +1,64 @@
package com.ibeetl.jlw.entity;
import com.ibeetl.admin.core.annotation.DictDeep;
import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.jlw.enums.QuestionLogAddTypeEnum;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.beetl.sql.annotation.entity.Auto;
import org.beetl.sql.annotation.entity.Table;
import org.beetl.sql.fetch.annotation.Fetch;
import org.beetl.sql.fetch.annotation.FetchSql;
import java.util.List;
/**
* 我的课程-题库-做题日志-分数信息
* @author mlx
*/
@Data
@Fetch
@EqualsAndHashCode(callSuper=false)
@SuppressWarnings("ALL")
@Table(name = "teacher_open_course_question_log")
public class TeacherOpenCourseQuestionLogScoreInfo1 extends BaseEntity {
// BeetlSQL Fetch 对ID有要求，这里搞个占位字段
@Auto
private Long teacherOpenCourseQuestionLogId ;
/** ========================================================================= */
/** ========== 这部分数据需要通过BeetlSQL来查询，才能自动触发FetchSql 注解 ========== */
// 开课题目设置ID
private Long teacherOpenCourseQuestionSettingId;
// 学生ID
private Long studentId;
// 题目提交类型
private QuestionLogAddTypeEnum questionLogAddType;
/** ========================================================================= */
@FetchSql("select * from question_log_summary t " +
"where t.question_setting_id = #teacherOpenCourseQuestionSettingId# " +
"and t.question_log_summary_status = 1 " +
"and t.person_id = #studentId# ")
@DictDeep
private QuestionLogSummary summaryInfo;
@FetchSql(value = "SELECT t.* " +
"FROM teacher_open_course_question_log t " +
"WHERE find_in_set(t.teacher_open_course_question_log_id , (" +
"select ta.question_log_ids from question_log_summary ta " +
"where ta.question_setting_id = #teacherOpenCourseQuestionSettingId# " +
"and ta.question_log_summary_status = 1 " +
"and ta.person_id = #studentId# " +
")) "
)
private List<TeacherOpenCourseQuestionLog> questionLogList;
}

46
web/src/main/java/com/ibeetl/jlw/entity/vo/GeneralQuestionTestSimpleInfoVO.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.ibeetl.jlw.entity.vo;
import com.ibeetl.admin.core.annotation.DictEnum;
import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.jlw.entity.QuestionLogSummary;
import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -15,7 +15,7 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper=false)
public class GeneralQuestionTestSimpleInfoVO extends BaseEntity {
public class GeneralQuestionTestSimpleInfoVO extends QuestionLogSummary {
//开课题目配置ID
@ -38,28 +38,34 @@ public class GeneralQuestionTestSimpleInfoVO extends BaseEntity {
private Date generalQuestionEndTime;
// 我的分数
private String myScore;
// 题目总数
private Integer questionTotalCount;
// 是否已交卷
private Boolean isFinished;
// 完成用时
private String finishTime;
// 完成用时（秒）
private String finishSecondTime;
// 正确率 最大100
@Override
public void setQuestionLogSummaryId(Long questionLogSummaryId) {
super.setQuestionLogSummaryId(questionLogSummaryId);
this.setIsFinished(null != questionLogSummaryId);
}
private Float correctRate;
// // 我的分数
//
// private String myScore;
//
// // 题目总数
//
// private Integer questionTotalCount;
//
// // 完成用时
//
// private String finishTime;
//
// // 完成用时（秒）
//
// private String finishSecondTime;
//
// // 正确率 最大100
//
// private Float correctRate;
}

23
web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java
Unescape Escape View File

@ -18,6 +18,7 @@ import com.ibeetl.admin.core.util.TimeTool;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.GeneralQuestionLogDao;
import com.ibeetl.jlw.dao.GeneralResourcesQuestionSnapshotDao;
import com.ibeetl.jlw.dao.StudentDao;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.dto.QuestionLogAddDTO;
@ -77,6 +78,7 @@ import static java.util.stream.Collectors.joining;
public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLog>{
@Autowired private GeneralQuestionLogDao generalQuestionLogDao;
@Autowired private GeneralResourcesQuestionSnapshotDao generalResourcesQuestionSnapshotDao;
@Autowired private StudentDao studentDao;
@Autowired private QuestionLogSummaryService questionLogSummaryService;
@Autowired @Lazy
@ -644,7 +646,7 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
// 最后提交试卷答案时候，才会记录错题
if (addType.equals(FINALLY_SUBMIT)) {
// 添加到题目日志汇总中
addQuestionLogSummary(updateList, logList.size(), student,
addQuestionLogSummary(updateList, student,
questionSetting.getGeneralQuestionSettingName(), questionSetting.getBusinessType(), questionSetting.getGeneralQuestionSettingType());
}
}
@ -730,7 +732,6 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
* 题目日志信息，分析汇总到某张表里
*
* @param logList 某个questionSettingId对应的题目日志列表
* @param questionSettingTotalCount 题目配置下的题目总数
* @param student 学生
* @param questionSettingName 题目配置的名称（试卷名称）
* @param fromType 题目配置来源类型
@ -740,16 +741,16 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
*/
public void addQuestionLogSummary(
@NotEmpty(message = "学生题目日志不能为空！") List<GeneralQuestionLog> logList,
@NotNull Integer questionSettingTotalCount,
@NotNull Student student, @NotBlank String questionSettingName, @NotNull QuestionBusinessTypeEnum fromType,
@NotNull ResourcesQuestionSnapshotFromTypeEnum snapshotFromTypeEnum) {
// 构建实体
final QuestionLogSummary questionLogSummary = new QuestionLogSummary();
final Long questionSettingId = logList.get(0).getGeneralQuestionSettingId();
final Integer questionTotalCount = generalResourcesQuestionSnapshotDao.getQuestionTotalCountBySettingId(questionSettingId);
// 做对数，做错数，总题数
Integer sumSuccessCount = 0, sumErrorCount = 0, sumDoCount = 0;
// 试卷总分数， 我的分数， 题目日志ID集
BigDecimal questionTotalScore = ZERO, myTotalScore = ZERO; StringBuilder sb = new StringBuilder();
BigDecimal questionTotalScore = ZERO, myTotalScore = ZERO; final Set<String> idsSet = new HashSet<>();
// 获取最大的完成时间
GeneralQuestionLog maxFinish = logList.stream().max((o1, o2) -> Math.toIntExact(o1.getGeneralQuestionLogFinishTime() - o2.getGeneralQuestionLogFinishTime()))
.get();
@ -764,10 +765,10 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
sumDoCount += ObjectUtil.isNotEmpty(questionLog.getGeneralQuestionLogAnswer()) ? 1 : 0;
questionTotalScore = questionTotalScore.add(questionLog.getQuestionScore());
myTotalScore = myTotalScore.add(questionLog.getStudentScore());
sb.append(questionLog.getGeneralQuestionLogId());
idsSet.add(questionLog.getGeneralQuestionLogId().toString());
}
// 是否通过及格率 TODO 及格率要查询数据库 这里先写死
double passRateSetting = 0.6;
BigDecimal passRateSetting = new BigDecimal("0.6");
boolean isPass = NumberUtil.isGreaterOrEqual(NumberUtil.mul(questionTotalScore, passRateSetting), myTotalScore);
questionLogSummary.setQuestionSettingId(questionSettingId);
@ -775,14 +776,16 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
questionLogSummary.setQuestionSettingType(snapshotFromTypeEnum);
questionLogSummary.setQuestionLogSummaryFromType(fromType);
questionLogSummary.setQuestionSettingTotalScore(questionTotalScore);
questionLogSummary.setQuestionLogSummaryStudentTotalScore(myTotalScore);
questionLogSummary.setPersonId(student.getStudentId());
questionLogSummary.setQuestionLogIds(sb.toString());
questionLogSummary.setQuestionLogSummaryQuestionTotalCount(questionSettingTotalCount);
questionLogSummary.setQuestionLogIds(join(idsSet.toArray(), ","));
questionLogSummary.setQuestionLogSummaryQuestionTotalCount(questionTotalCount);
questionLogSummary.setQuestionLogSummaryStudentDoCount(sumDoCount);
questionLogSummary.setQuestionLogSummarySuccessCount(sumSuccessCount);
questionLogSummary.setQuestionLogSummaryErrorCount(sumErrorCount);
questionLogSummary.setQuestionLogSummarySuccessRate(NumberUtil.div(sumSuccessCount, questionSettingTotalCount, 2).multiply(new BigDecimal(100)));
questionLogSummary.setQuestionLogSummaryCurrentPassRate(new BigDecimal(passRateSetting));
BigDecimal successRate = NumberUtil.div(sumSuccessCount, questionTotalCount, 3).multiply(new BigDecimal(100));
questionLogSummary.setQuestionLogSummarySuccessRate(successRate);
questionLogSummary.setQuestionLogSummaryCurrentPassRate(passRateSetting);
questionLogSummary.setQuestionLogSummaryIsPass(BooleanUtil.toInteger(isPass));
questionLogSummary.setQuestionLogSummaryStatus(1);
questionLogSummary.setQuestionLogSummaryAddTime(new Date());

37
web/src/main/java/com/ibeetl/jlw/service/GeneralResourcesQuestionSnapshotService.java
Unescape Escape View File

@ -12,10 +12,7 @@ import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.GeneralResourcesQuestionSnapshotDao;
import com.ibeetl.jlw.entity.FileEntity;
import com.ibeetl.jlw.entity.GeneralQuestionLogScoreInfo;
import com.ibeetl.jlw.entity.GeneralResourcesQuestionSnapshot;
import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.dto.GeneralQuestionTestSimpleInfoDTO;
import com.ibeetl.jlw.entity.dto.QuestionSettingDTO;
import com.ibeetl.jlw.entity.vo.GeneralQuestionTestSimpleInfoVO;
@ -449,11 +446,14 @@ public class GeneralResourcesQuestionSnapshotService extends CoreBaseService<Gen
/**
* 学生端-开课相关
* 查询学生的得分信息
* 从题目日志中计算，后期浪费性能
* {@link #getScoreInfo1}
*
* @param questionSettingId 题目配置ID
* @param questionLogAddType 题目提交类型
* @return
*/
@Deprecated
public GeneralQuestionLogScoreInfo getScoreInfo(@NotNull(message = "开课题目配置ID不能为空！") final Long questionSettingId,
@NotNull(message = "题目提交类型不能为空！") QuestionLogAddTypeEnum questionLogAddType) {
@ -474,4 +474,33 @@ public class GeneralResourcesQuestionSnapshotService extends CoreBaseService<Gen
dictParser(scoreInfo);
return scoreInfo;
}
/**
* 学生端-开课相关
* 查询学生的得分信息
*
* @param questionSettingId 题目配置ID
* @param questionLogAddType 题目提交类型
* @return
*/
public GeneralQuestionLogScoreInfo1 getScoreInfo1(@NotNull(message = "开课题目配置ID不能为空！") final Long questionSettingId,
@NotNull(message = "题目提交类型不能为空！") QuestionLogAddTypeEnum questionLogAddType) {
// 查询学生身份
Student student = getStudent();
Assert.notNull(student, "该接口只能学生访问");
final Long studentId = student.getStudentId();
generalQuestionSettingService
.validateFinallySubmitThrow(questionSettingId, studentId, "该试卷暂无题目！", "未交卷状态，无法查看成绩！");
// 给实体类传参数，剩下来的交给Fetch 来处理
// 查询符合条件的实体
GeneralQuestionLogScoreInfo1 scoreInfo = sqlManager.executeQueryOne(
new SQLReady("SELECT ? as general_question_setting_id, ? as student_id , ? as question_add_type",
questionSettingId, studentId, questionLogAddType), GeneralQuestionLogScoreInfo1.class);
dictParser(scoreInfo);
return scoreInfo;
}
}

32
web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java
Unescape Escape View File

@ -444,11 +444,14 @@ public class ResourcesQuestionSnapshotService extends CoreBaseService<ResourcesQ
/**
* 学生端-开课相关
* 查询学生的得分信息
* 从题目日志中去算结果（会存在不准的情况）
* 替代函数{@link #getScoreInfo1}
*
* @param questionSettingId 开课题目配置ID
* @param questionLogAddType 题目提交类型
* @return
*/
@Deprecated
public TeacherOpenCourseQuestionLogScoreInfo getScoreInfo(
@NotNull(message = "开课题目配置ID不能为空！") final Long questionSettingId,
@NotNull(message = "题目提交类型不能为空！") QuestionLogAddTypeEnum questionLogAddType) {
@ -470,6 +473,35 @@ public class ResourcesQuestionSnapshotService extends CoreBaseService<ResourcesQ
return scoreInfo;
}
/**
* 学生端-开课相关
* 查询学生的得分信息
*
* @param questionSettingId 开课题目配置ID
* @param questionLogAddType 题目提交类型
* @return
*/
public TeacherOpenCourseQuestionLogScoreInfo1 getScoreInfo1(
@NotNull(message = "开课题目配置ID不能为空！") final Long questionSettingId,
@NotNull(message = "题目提交类型不能为空！") QuestionLogAddTypeEnum questionLogAddType) {
// 查询学生身份
Student student = getStudent();
Assert.notNull(student, "该接口只能学生访问");
Long studentId = student.getStudentId();
teacherOpenCourseQuestionSettingService
.validateFinallySubmitThrow(questionSettingId, studentId, "该试卷暂无题目！", "未交卷状态，无法查看成绩！");
// 给实体类传参数，剩下来的交给Fetch 来处理
// 查询符合条件的实体
TeacherOpenCourseQuestionLogScoreInfo1 scoreInfo = sqlManager.executeQueryOne(
new SQLReady("SELECT ? as teacher_open_course_question_setting_id, ? as student_id, ? as question_log_add_type",
questionSettingId, studentId, questionLogAddType), TeacherOpenCourseQuestionLogScoreInfo1.class);
dictParser(scoreInfo);
return scoreInfo;
}
/**
* 简单获取题目的信息
* @param query 开课题目配置ID

24
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
Unescape Escape View File

@ -57,6 +57,7 @@ import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.*;
import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE;
import static com.ibeetl.jlw.enums.ResourcesQuestionTypeEnum.isOneQuestion;
import static java.lang.Math.abs;
import static java.lang.Math.toIntExact;
import static java.math.BigDecimal.ZERO;
import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.joining;
@ -444,7 +445,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
// 最后提交试卷答案时候，才会记录错题
if (addType.equals(FINALLY_SUBMIT)) {
// 添加到题目日志汇总中
addQuestionLogSummary(updateList, logList.size(), student,
addQuestionLogSummary(updateList, student,
questionSetting.getTeacherOpenCourseQuestionSettingName(), questionSetting.getTeacherOpenCourseQuestionSettingType());
// 批量插入错题集（错题库），方法内部自带分数判断。内部方法更新log中的错题标记。
teacherOpenCourseQuestionLogWrongService.insertBatchByQuestionLogList(updateList);
@ -532,7 +533,6 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
* 题目日志信息，分析汇总到某张表里
*
* @param logList 某个questionSettingId对应的题目日志列表
* @param questionSettingTotalCount 题目配置下的题目总数
* @param student 学生
* @param questionSettingName 题目配置的名称（试卷名称）
* @param snapshotFromTypeEnum 题目来源
@ -541,19 +541,19 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
*/
public void addQuestionLogSummary(
@NotEmpty(message = "学生题目日志不能为空！") List<TeacherOpenCourseQuestionLog> logList,
@NotNull Integer questionSettingTotalCount,
@NotNull Student student, @NotBlank String questionSettingName, @NotNull ResourcesQuestionSnapshotFromTypeEnum snapshotFromTypeEnum) {
// 构建实体
final QuestionLogSummary questionLogSummary = new QuestionLogSummary();
final Long questionSettingId = logList.get(0).getTeacherOpenCourseQuestionSettingId();
final Integer questionTotalCount = resourcesQuestionSnapshotDao.getQuestionTotalCountBySettingId(questionSettingId);
// 做对数，做错数，总题数
Integer sumSuccessCount = 0, sumErrorCount = 0, sumDoCount = 0;
// 试卷总分数， 我的分数， 题目日志ID集
BigDecimal questionTotalScore = ZERO, myTotalScore = ZERO; StringBuilder sb = new StringBuilder();
BigDecimal questionTotalScore = ZERO, myTotalScore = ZERO; final Set<String> idsSet = new HashSet<>();
// 获取最大的完成时间
TeacherOpenCourseQuestionLog maxFinish = logList.stream()
.max((o1, o2) -> Math.toIntExact(o1.getTeacherOpenCourseQuestionLogFinishTime() - o2.getTeacherOpenCourseQuestionLogFinishTime()))
.max((o1, o2) -> toIntExact(o1.getTeacherOpenCourseQuestionLogFinishTime() - o2.getTeacherOpenCourseQuestionLogFinishTime()))
.get();
for (TeacherOpenCourseQuestionLog questionLog : logList) {
@ -566,24 +566,26 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
sumDoCount += ObjectUtil.isNotEmpty(questionLog.getTeacherOpenCourseQuestionLogAnswer()) ? 1 : 0;
questionTotalScore = questionTotalScore.add(questionLog.getQuestionScore());
myTotalScore = myTotalScore.add(questionLog.getStudentScore());
sb.append(questionLog.getTeacherOpenCourseQuestionLogId());
idsSet.add(questionLog.getTeacherOpenCourseQuestionLogId().toString());
}
// 是否通过及格率 TODO 及格率要查询数据库 这里先写死
double passRateSetting = 0.6;
BigDecimal passRateSetting = new BigDecimal("0.6");
boolean isPass = NumberUtil.isGreaterOrEqual(NumberUtil.mul(questionTotalScore, passRateSetting), myTotalScore);
questionLogSummary.setQuestionSettingId(questionSettingId);
questionLogSummary.setQuestionSettingName(questionSettingName);
questionLogSummary.setQuestionSettingType(snapshotFromTypeEnum);
questionLogSummary.setQuestionLogSummaryFromType(FROM_OPEN_COURSE);
questionLogSummary.setQuestionSettingTotalScore(questionTotalScore);
questionLogSummary.setQuestionLogSummaryStudentTotalScore(myTotalScore);
questionLogSummary.setPersonId(student.getStudentId());
questionLogSummary.setQuestionLogIds(sb.toString());
questionLogSummary.setQuestionLogSummaryQuestionTotalCount(questionSettingTotalCount);
questionLogSummary.setQuestionLogIds(join(idsSet.toArray(), ","));
questionLogSummary.setQuestionLogSummaryQuestionTotalCount(questionTotalCount);
questionLogSummary.setQuestionLogSummaryStudentDoCount(sumDoCount);
questionLogSummary.setQuestionLogSummarySuccessCount(sumSuccessCount);
questionLogSummary.setQuestionLogSummaryErrorCount(sumErrorCount);
questionLogSummary.setQuestionLogSummarySuccessRate(NumberUtil.div(sumSuccessCount, questionSettingTotalCount, 2).multiply(new BigDecimal(100)));
questionLogSummary.setQuestionLogSummaryCurrentPassRate(new BigDecimal(passRateSetting));
BigDecimal successRate = NumberUtil.div(sumSuccessCount, questionTotalCount, 3).multiply(new BigDecimal(100));
questionLogSummary.setQuestionLogSummarySuccessRate(successRate);
questionLogSummary.setQuestionLogSummaryCurrentPassRate(passRateSetting);
questionLogSummary.setQuestionLogSummaryIsPass(BooleanUtil.toInteger(isPass));
questionLogSummary.setQuestionLogSummaryStatus(1);
questionLogSummary.setQuestionLogSummaryAddTime(new Date());

51
web/src/main/java/com/ibeetl/jlw/web/GeneralResourcesQuestionSnapshotController.java
Unescape Escape View File

@ -13,6 +13,7 @@ import com.ibeetl.admin.core.util.TimeTool;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.entity.FileEntity;
import com.ibeetl.jlw.entity.GeneralQuestionLogScoreInfo;
import com.ibeetl.jlw.entity.GeneralQuestionLogScoreInfo1;
import com.ibeetl.jlw.entity.GeneralResourcesQuestionSnapshot;
import com.ibeetl.jlw.entity.dto.GeneralQuestionTestSimpleInfoDTO;
import com.ibeetl.jlw.enums.QuestionLogAddTypeEnum;
@ -108,9 +109,9 @@ public class GeneralResourcesQuestionSnapshotController{
* @param coreUser
* @return
*/
@PostMapping(API + "/getScoreInfo.do")
@PostMapping(API + "/getScoreInfoOld.do")
@ResponseBody
public JsonResult<GeneralQuestionLogScoreInfo> getScoreInfoDo(
public JsonResult<GeneralQuestionLogScoreInfo> getScoreInfoDo1(
Long questionSettingId,
@RequestParam(required = false, defaultValue = "FINALLY_SUBMIT") QuestionLogAddTypeEnum questionLogAddType,
@SCoreUser
@ -118,6 +119,28 @@ public class GeneralResourcesQuestionSnapshotController{
return JsonResult.success(generalResourcesQuestionSnapshotService.getScoreInfo(questionSettingId, questionLogAddType));
}
/**
* 学生端-查询分数信息
* 查询指定题目提交类型
*
* 支持根据来源类型查询
* 考试完以后，查看分数情况。
*
* @param questionSettingId 题目配置ID
* @param questionLogAddType 题目提交类型
* @param coreUser
* @return
*/
@PostMapping(API + "/getScoreInfo.do")
@ResponseBody
public JsonResult<GeneralQuestionLogScoreInfo1> getScoreInfoDo(
Long questionSettingId,
@RequestParam(required = false, defaultValue = "FINALLY_SUBMIT") QuestionLogAddTypeEnum questionLogAddType,
@SCoreUser
CoreUser coreUser) {
return JsonResult.success(generalResourcesQuestionSnapshotService.getScoreInfo1(questionSettingId, questionLogAddType));
}
/**
* 学生端-获取章节练习的简单信息
* 支持根据来源类型查询
@ -473,7 +496,7 @@ public class GeneralResourcesQuestionSnapshotController{
* @param coreUser
* @return
*/
@PostMapping(MODEL + "/getScoreInfo.json")
@PostMapping(MODEL + "/getScoreInfoOld.json")
@Function("teacherOpenCourseQuestionLog.query")
@ResponseBody
public JsonResult<GeneralQuestionLogScoreInfo> getScoreInfo(
@ -483,4 +506,26 @@ public class GeneralResourcesQuestionSnapshotController{
CoreUser coreUser) {
return JsonResult.success(generalResourcesQuestionSnapshotService.getScoreInfo(questionSettingId, questionLogAddType));
}
/**
* 学生端-查询分数信息
* 查询指定题目提交类型
*
* 支持根据来源类型查询
* 考试完以后，查看分数情况。
*
* @param questionSettingId 题目配置ID
* @param questionLogAddType 题目提交类型
* @param coreUser
* @return
*/
@PostMapping(API + "/getScoreInfo.json")
@ResponseBody
public JsonResult<GeneralQuestionLogScoreInfo1> getScoreInfo1(
Long questionSettingId,
@RequestParam(required = false, defaultValue = "FINALLY_SUBMIT") QuestionLogAddTypeEnum questionLogAddType,
@SCoreUser
CoreUser coreUser) {
return JsonResult.success(generalResourcesQuestionSnapshotService.getScoreInfo1(questionSettingId, questionLogAddType));
}
}

50
web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java
Unescape Escape View File

@ -11,6 +11,7 @@ import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLogScoreInfo;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLogScoreInfo1;
import com.ibeetl.jlw.entity.dto.TeacherOpenCourseQuestionTestDetailDTO;
import com.ibeetl.jlw.entity.dto.TeacherOpenCourseQuestionTestSimpleInfoDTO;
import com.ibeetl.jlw.entity.vo.TeacherOpenCourseQuestionTestDetailVO;
@ -107,9 +108,9 @@ public class ResourcesQuestionSnapshotController extends BaseController {
* @param coreUser
* @return
*/
@PostMapping(API + "/getScoreInfo.do")
@PostMapping(API + "/getScoreInfoOld.do")
@ResponseBody
public JsonResult<TeacherOpenCourseQuestionLogScoreInfo> getScoreInfoDo(
public JsonResult<TeacherOpenCourseQuestionLogScoreInfo> getScoreInfoOld(
Long questionSettingId,
@RequestParam(required = false, defaultValue = "FINALLY_SUBMIT") QuestionLogAddTypeEnum questionLogAddType,
@SCoreUser
@ -117,6 +118,26 @@ public class ResourcesQuestionSnapshotController extends BaseController {
return JsonResult.success(resourcesQuestionSnapshotService.getScoreInfo(questionSettingId, questionLogAddType));
}
/**
* 学生端-查询分数信息
*
* 支持根据来源类型查询
* 考试完以后，查看分数情况。
*
* @param questionSettingId 开课题目配置ID
* @param coreUser
* @return
*/
@PostMapping(API + "/getScoreInfo.do")
@ResponseBody
public JsonResult<TeacherOpenCourseQuestionLogScoreInfo1> getScoreInfoDo(
Long questionSettingId,
@RequestParam(required = false, defaultValue = "FINALLY_SUBMIT") QuestionLogAddTypeEnum questionLogAddType,
@SCoreUser
CoreUser coreUser) {
return JsonResult.success(resourcesQuestionSnapshotService.getScoreInfo1(questionSettingId, questionLogAddType));
}
/**
* 教师端-获取题目的练习成绩
* 支持根据来源类型查询
@ -302,16 +323,37 @@ public class ResourcesQuestionSnapshotController extends BaseController {
* @param coreUser
* @return
*/
@PostMapping(MODEL + "/getScoreInfo.json")
@PostMapping(MODEL + "/getScoreInfoOld.json")
@Function("teacherOpenCourseQuestionLog.query")
@ResponseBody
public JsonResult<TeacherOpenCourseQuestionLogScoreInfo> getScoreInfo(
public JsonResult<TeacherOpenCourseQuestionLogScoreInfo> getScoreInfoOld1(
Long questionSettingId,
@RequestParam(required = false, defaultValue = "FINALLY_SUBMIT") QuestionLogAddTypeEnum questionLogAddType,
@SCoreUser
CoreUser coreUser) {
return JsonResult.success(resourcesQuestionSnapshotService.getScoreInfo(questionSettingId, questionLogAddType));
}
/**
* 学生端-查询分数信息
*
* 支持根据来源类型查询
* 考试完以后，查看分数情况。
*
* @param questionSettingId 开课题目配置ID
* @param questionLogAddType 题目提交类型
* @param coreUser
* @return
*/
@PostMapping(MODEL + "/getScoreInfo.json")
@Function("teacherOpenCourseQuestionLog.query")
@ResponseBody
public JsonResult<TeacherOpenCourseQuestionLogScoreInfo1> getScoreInfo(
Long questionSettingId,
@RequestParam(required = false, defaultValue = "FINALLY_SUBMIT") QuestionLogAddTypeEnum questionLogAddType,
@SCoreUser
CoreUser coreUser) {
return JsonResult.success(resourcesQuestionSnapshotService.getScoreInfo1(questionSettingId, questionLogAddType));
}
/**
* 教师端-获取题目的练习成绩

11
web/src/main/java/com/ibeetl/jlw/web/query/QuestionLogSummaryQuery.java
Unescape Escape View File

@ -28,6 +28,8 @@ public class QuestionLogSummaryQuery extends PageParam {
private QuestionBusinessTypeEnum questionLogSummaryFromType;
@Query(name = "配置的题目总分数", display = false)
private BigDecimal questionSettingTotalScore;
@Query(name = "学生总得分", display = false)
private BigDecimal questionLogSummaryStudentTotalScore;
@Query(name = "人员ID（学生ID等等）", display = false)
private Long personId;
@Query(name = "关联的做题日志IDs", display = false)
@ -193,6 +195,7 @@ public class QuestionLogSummaryQuery extends PageParam {
pojo.setQuestionSettingType(this.getQuestionSettingType());
pojo.setQuestionLogSummaryFromType(this.getQuestionLogSummaryFromType());
pojo.setQuestionSettingTotalScore(this.getQuestionSettingTotalScore());
pojo.setQuestionLogSummaryStudentTotalScore(this.getQuestionLogSummaryStudentTotalScore());
pojo.setPersonId(this.getPersonId());
pojo.setQuestionLogIds(this.getQuestionLogIds());
pojo.setQuestionLogSummaryQuestionTotalCount(this.getQuestionLogSummaryQuestionTotalCount());
@ -275,4 +278,12 @@ public class QuestionLogSummaryQuery extends PageParam {
public void setFinishTime(String finishTime) {
this.finishTime = finishTime;
}
public BigDecimal getQuestionLogSummaryStudentTotalScore() {
return questionLogSummaryStudentTotalScore;
}
public void setQuestionLogSummaryStudentTotalScore(BigDecimal questionLogSummaryStudentTotalScore) {
this.questionLogSummaryStudentTotalScore = questionLogSummaryStudentTotalScore;
}
}

36
web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md
Unescape Escape View File

@ -798,7 +798,7 @@ getQuestionBySettingOptionDTO
@}
getQuestionTestSimpleInfo
getQuestionTestSimpleInfo1
===
* 学生端- 题目的简单信息（包含学生得分）
SELECT
@ -902,6 +902,40 @@ getQuestionTestSimpleInfo
) z
getQuestionTestSimpleInfo
===
* 学生端- 题目的简单信息（包含学生得分）
SELECT
@pageTag(){
t.general_question_setting_id,
t.general_question_setting_name,
t.general_question_setting_type,
t.general_question_start_time,
t.general_question_end_time,
ta.*,
( select count(distinct(tb.general_resources_question_snapshot_id)) from general_resources_question_snapshot tb
where tb.general_question_setting_id = t.general_question_setting_id
and tb.question_status = 1
) as question_total_count
@}
FROM
general_question_setting t
left join question_log_summary ta on ta.question_setting_id = t.general_question_setting_id
AND ta.person_id = #studentId#
AND ta.question_log_summary_status = 1
WHERE
1 = 1
AND t.general_question_setting_push_status = 1
AND t.general_question_setting_status = 1
AND t.general_question_setting_type = #generalQuestionSettingType#
AND t.general_id = #teacherOpenCourseId#
@pageIgnoreTag() {
ORDER BY
t.general_question_setting_name ASC
@}
questionTestResults
===
* 教师端-题目的练习详情

38
web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md
Unescape Escape View File

@ -586,7 +586,7 @@ getValuesByQueryNotWithPermission
@}
asc
getQuestionTestSimpleInfo
getQuestionTestSimpleInfo1
===
* 学生端- 题目的简单信息（包含学生得分）
@ -686,10 +686,46 @@ getQuestionTestSimpleInfo
AND t.teacher_open_course_question_setting_push_status = 1
AND t.teacher_open_course_question_setting_status = 1
AND t.teacher_open_course_id = #teacherOpenCourseId#
@pageIgnoreTag() {
ORDER BY
t.teacher_open_course_question_setting_name ASC
@}
) z
getQuestionTestSimpleInfo
===
* 学生端- 题目的简单信息（包含学生得分）
SELECT
@pageTag(){
t.teacher_open_course_question_setting_id,
t.teacher_open_course_question_setting_name,
t.teacher_open_course_question_setting_type,
t.teacher_open_course_question_start_time,
t.teacher_open_course_question_end_time,
ta.*,
( select count(distinct(tb.resources_question_snapshot_id)) from resources_question_snapshot tb
where tb.teacher_open_course_question_setting_id = t.teacher_open_course_question_setting_id
and tb.question_status = 1
) as question_total_count
@}
FROM
teacher_open_course_question_setting t
left join question_log_summary ta on ta.question_setting_id = t.teacher_open_course_question_setting_id
AND ta.person_id = #studentId#
AND ta.question_log_summary_status = 1
WHERE
1 = 1
AND t.teacher_open_course_question_setting_push_status = 1
AND t.teacher_open_course_question_setting_status = 1
AND t.teacher_open_course_question_setting_type = #teacherOpenCourseQuestionSettingType#
AND t.teacher_open_course_id = #teacherOpenCourseId#
@pageIgnoreTag() {
ORDER BY
t.teacher_open_course_question_setting_name ASC
@}
questionTestResults
===
* 教师端-题目的练习详情

Write Preview
Loading…
Cancel
Save