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

改字段名

Browse Source
beetlsql3-dev
Mlxa0324 3 years ago
parent 1ece4cd0ef
commit 0133dc2a71
19 changed files with 1487 additions and 1449 deletions
Show Stats Download Patch File Download Diff File

2469
data_base_design/天泽数据大平台.pdb
View File

File diff suppressed because it is too large Load Diff

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1664461421" Name="cjks" Objects="1205" Symbols="114" 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="1664507810" Name="cjks" Objects="1079" Symbols="91" 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 --> <!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object"> <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -4245,8 +4245,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o12"> <o:ExtendedDependencySymbol Id="o12">
<a:CreationDate>1661873621</a:CreationDate> <a:CreationDate>1661873621</a:CreationDate>
<a:ModificationDate>1662047569</a:ModificationDate> <a:ModificationDate>1662047569</a:ModificationDate>
<a:Rect>((246268,43472), (264930,44072))</a:Rect> <a:Rect>((246268,43682), (266029,44282))</a:Rect>
<a:ListOfPoints>((246268,43775),(262159,43775),(262159,43772),(264930,43772))</a:ListOfPoints> <a:ListOfPoints>((246268,43775),(262159,43775),(262159,43982),(266029,43982))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4266,8 +4266,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o16"> <o:ExtendedDependencySymbol Id="o16">
<a:CreationDate>1661873633</a:CreationDate> <a:CreationDate>1661873633</a:CreationDate>
<a:ModificationDate>1663942424</a:ModificationDate> <a:ModificationDate>1663942424</a:ModificationDate>
<a:Rect>((276082,55755), (276682,70644))</a:Rect> <a:Rect>((276072,55453), (276672,70644))</a:Rect>
<a:ListOfPoints>((276382,70644),(276382,55755))</a:ListOfPoints> <a:ListOfPoints>((276372,70644),(276372,55453))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4287,8 +4287,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o19"> <o:ExtendedDependencySymbol Id="o19">
<a:CreationDate>1661955336</a:CreationDate> <a:CreationDate>1661955336</a:CreationDate>
<a:ModificationDate>1662048056</a:ModificationDate> <a:ModificationDate>1662048056</a:ModificationDate>
<a:Rect>((262886,18534), (281960,23328))</a:Rect> <a:Rect>((262886,18534), (283315,23535))</a:Rect>
<a:ListOfPoints>((262886,18534),(262886,23028),(281960,23028))</a:ListOfPoints> <a:ListOfPoints>((262886,18534),(262886,23235),(283315,23235))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4329,8 +4329,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o26"> <o:ExtendedDependencySymbol Id="o26">
<a:CreationDate>1661960819</a:CreationDate> <a:CreationDate>1661960819</a:CreationDate>
<a:ModificationDate>1662647010</a:ModificationDate> <a:ModificationDate>1662647010</a:ModificationDate>
<a:Rect>((307769,27554), (308637,43057))</a:Rect> <a:Rect>((306801,27571), (307812,43062))</a:Rect>
<a:ListOfPoints>((307769,43057),(307769,35670),(308337,35670),(308337,27554))</a:ListOfPoints> <a:ListOfPoints>((307812,43062),(307812,35670),(307101,35670),(307101,27571))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4391,8 +4391,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o36"> <o:ExtendedDependencySymbol Id="o36">
<a:CreationDate>1662020600</a:CreationDate> <a:CreationDate>1662020600</a:CreationDate>
<a:ModificationDate>1663511274</a:ModificationDate> <a:ModificationDate>1663511274</a:ModificationDate>
<a:Rect>((308526,-926), (328444,24981))</a:Rect> <a:Rect>((307242,-926), (328444,25106))</a:Rect>
<a:ListOfPoints>((328444,-926),(328444,11662),(308826,11662),(308826,24981))</a:ListOfPoints> <a:ListOfPoints>((328444,-926),(328444,11662),(307542,11662),(307542,25106))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4412,8 +4412,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o39"> <o:ExtendedDependencySymbol Id="o39">
<a:CreationDate>1662020790</a:CreationDate> <a:CreationDate>1662020790</a:CreationDate>
<a:ModificationDate>1662647017</a:ModificationDate> <a:ModificationDate>1662647017</a:ModificationDate>
<a:Rect>((284883,31246), (286110,48451))</a:Rect> <a:Rect>((285142,31108), (286521,48461))</a:Rect>
<a:ListOfPoints>((286110,48451),(286110,37421),(285183,37421),(285183,31246))</a:ListOfPoints> <a:ListOfPoints>((285142,48461),(285142,37421),(286221,37421),(286221,31108))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4433,8 +4433,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o41"> <o:ExtendedDependencySymbol Id="o41">
<a:CreationDate>1662045015</a:CreationDate> <a:CreationDate>1662045015</a:CreationDate>
<a:ModificationDate>1664295296</a:ModificationDate> <a:ModificationDate>1664295296</a:ModificationDate>
<a:Rect>((248596,52557), (276561,53260))</a:Rect> <a:Rect>((248596,52379), (276525,53260))</a:Rect>
<a:ListOfPoints>((248596,53260),(262008,53260),(262008,52857),(276561,52857))</a:ListOfPoints> <a:ListOfPoints>((248596,53260),(262008,53260),(262008,52679),(276525,52679))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4454,8 +4454,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o44"> <o:ExtendedDependencySymbol Id="o44">
<a:CreationDate>1662046228</a:CreationDate> <a:CreationDate>1662046228</a:CreationDate>
<a:ModificationDate>1662647031</a:ModificationDate> <a:ModificationDate>1662647031</a:ModificationDate>
<a:Rect>((302015,-1243), (302615,27790))</a:Rect> <a:Rect>((301371,-1243), (302023,27797))</a:Rect>
<a:ListOfPoints>((302023,-1243),(302023,15258),(302315,15258),(302315,27790))</a:ListOfPoints> <a:ListOfPoints>((302023,-1243),(302023,15258),(301671,15258),(301671,27797))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4475,8 +4475,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o47"> <o:ExtendedDependencySymbol Id="o47">
<a:CreationDate>1662047541</a:CreationDate> <a:CreationDate>1662047541</a:CreationDate>
<a:ModificationDate>1662047695</a:ModificationDate> <a:ModificationDate>1662047695</a:ModificationDate>
<a:Rect>((250779,30697), (297018,31870))</a:Rect> <a:Rect>((250779,30569), (296894,31870))</a:Rect>
<a:ListOfPoints>((250779,31870),(278057,31870),(278057,30997),(297018,30997))</a:ListOfPoints> <a:ListOfPoints>((250779,31870),(278057,31870),(278057,30869),(296894,30869))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4496,8 +4496,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o50"> <o:ExtendedDependencySymbol Id="o50">
<a:CreationDate>1662048005</a:CreationDate> <a:CreationDate>1662048005</a:CreationDate>
<a:ModificationDate>1662048061</a:ModificationDate> <a:ModificationDate>1662048061</a:ModificationDate>
<a:Rect>((230014,25632), (295754,27797))</a:Rect> <a:Rect>((230014,25717), (295754,27797))</a:Rect>
<a:ListOfPoints>((230014,27797),(230014,25932),(295754,25932))</a:ListOfPoints> <a:ListOfPoints>((230014,27797),(230014,26017),(295754,26017))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4517,8 +4517,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o53"> <o:ExtendedDependencySymbol Id="o53">
<a:CreationDate>1662647833</a:CreationDate> <a:CreationDate>1662647833</a:CreationDate>
<a:ModificationDate>1662647877</a:ModificationDate> <a:ModificationDate>1662647877</a:ModificationDate>
<a:Rect>((284029,14785), (284830,27625))</a:Rect> <a:Rect>((284830,14785), (285751,27639))</a:Rect>
<a:ListOfPoints>((284830,14785),(284830,20457),(284329,20457),(284329,27625))</a:ListOfPoints> <a:ListOfPoints>((284830,14785),(284830,20457),(285451,20457),(285451,27639))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4556,8 +4556,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o59"> <o:ExtendedDependencySymbol Id="o59">
<a:CreationDate>1662810688</a:CreationDate> <a:CreationDate>1662810688</a:CreationDate>
<a:ModificationDate>1663748414</a:ModificationDate> <a:ModificationDate>1663748414</a:ModificationDate>
<a:Rect>((296433,28995), (338650,29922))</a:Rect> <a:Rect>((296366,28995), (338650,29852))</a:Rect>
<a:ListOfPoints>((338650,28995),(319044,28995),(319044,29622),(296433,29622))</a:ListOfPoints> <a:ListOfPoints>((338650,28995),(319044,28995),(319044,29552),(296366,29552))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4577,8 +4577,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o61"> <o:ExtendedDependencySymbol Id="o61">
<a:CreationDate>1662865795</a:CreationDate> <a:CreationDate>1662865795</a:CreationDate>
<a:ModificationDate>1663518168</a:ModificationDate> <a:ModificationDate>1663518168</a:ModificationDate>
<a:Rect>((286927,15194), (337794,23674))</a:Rect> <a:Rect>((287794,15194), (337794,23866))</a:Rect>
<a:ListOfPoints>((337794,15194),(319320,15194),(319320,23374),(286927,23374))</a:ListOfPoints> <a:ListOfPoints>((337794,15194),(319320,15194),(319320,23566),(287794,23566))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4598,8 +4598,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o64"> <o:ExtendedDependencySymbol Id="o64">
<a:CreationDate>1664451291</a:CreationDate> <a:CreationDate>1664451291</a:CreationDate>
<a:ModificationDate>1664451291</a:ModificationDate> <a:ModificationDate>1664451291</a:ModificationDate>
<a:Rect>((242400,17940), (284580,26940))</a:Rect> <a:Rect>((241808,17898), (285677,26995))</a:Rect>
<a:ListOfPoints>((242400,17940),(242400,26640),(284580,26640))</a:ListOfPoints> <a:ListOfPoints>((241808,17898),(241808,26695),(285677,26695))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4618,8 +4618,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o67"> <o:ExtendedDependencySymbol Id="o67">
<a:CreationDate>1664451372</a:CreationDate> <a:CreationDate>1664451372</a:CreationDate>
<a:ModificationDate>1664451372</a:ModificationDate> <a:ModificationDate>1664451372</a:ModificationDate>
<a:Rect>((206700,6900), (233940,18540))</a:Rect> <a:Rect>((206557,6841), (234162,18485))</a:Rect>
<a:ListOfPoints>((206700,6900),(206700,18240),(233940,18240))</a:ListOfPoints> <a:ListOfPoints>((206557,6841),(206557,18185),(234162,18185))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4638,8 +4638,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o70"> <o:ExtendedDependencySymbol Id="o70">
<a:CreationDate>1664453932</a:CreationDate> <a:CreationDate>1664453932</a:CreationDate>
<a:ModificationDate>1664453932</a:ModificationDate> <a:ModificationDate>1664453932</a:ModificationDate>
<a:Rect>((234320,-16131), (248051,15668))</a:Rect> <a:Rect>((234477,-16251), (248093,15721))</a:Rect>
<a:ListOfPoints>((248051,-16131),(234620,-16131),(234620,15668))</a:ListOfPoints> <a:ListOfPoints>((248093,-16251),(234777,-16251),(234777,15721))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4658,8 +4658,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o73"> <o:ExtendedDependencySymbol Id="o73">
<a:CreationDate>1664461421</a:CreationDate> <a:CreationDate>1664461421</a:CreationDate>
<a:ModificationDate>1664461421</a:ModificationDate> <a:ModificationDate>1664461421</a:ModificationDate>
<a:Rect>((290881,-26780), (299893,-3621))</a:Rect> <a:Rect>((290808,-26815), (299893,-3621))</a:Rect>
<a:ListOfPoints>((290881,-26780),(290881,-10490),(299593,-10490),(299593,-3621))</a:ListOfPoints> <a:ListOfPoints>((290808,-26815),(290808,-10490),(299593,-10490),(299593,-3621))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle> <a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor> <a:LineColor>16744576</a:LineColor>
@ -4679,7 +4679,7 @@ Shadow=0</a:DisplayPreferences>
<a:CreationDate>1623769194</a:CreationDate> <a:CreationDate>1623769194</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate> <a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((-9459,51176), (6463,66472))</a:Rect> <a:Rect>((-8713,51503), (5717,66145))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -4704,7 +4704,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623769937</a:CreationDate> <a:CreationDate>1623769937</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate> <a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((-9331,11854), (6591,25350))</a:Rect> <a:Rect>((-8585,12140), (5845,25064))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -4756,7 +4756,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623770338</a:CreationDate> <a:CreationDate>1623770338</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate> <a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((-9283,-14307), (6639,89))</a:Rect> <a:Rect>((-8537,-14000), (5893,-218))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -4835,7 +4835,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623826338</a:CreationDate> <a:CreationDate>1623826338</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate> <a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((40688,49404), (68722,57500))</a:Rect> <a:Rect>((42066,49567), (67344,57337))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -4860,7 +4860,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828456</a:CreationDate> <a:CreationDate>1623828456</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate> <a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((8540,1660), (34844,17856))</a:Rect> <a:Rect>((9827,2008), (33557,17508))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -4885,7 +4885,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828633</a:CreationDate> <a:CreationDate>1623828633</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate> <a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((10906,-10357), (31586,-461))</a:Rect> <a:Rect>((11900,-10153), (30592,-665))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -4910,7 +4910,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828682</a:CreationDate> <a:CreationDate>1623828682</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate> <a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((10673,-24326), (31353,-14430))</a:Rect> <a:Rect>((11667,-24122), (30359,-14634))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -4960,7 +4960,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828770</a:CreationDate> <a:CreationDate>1623828770</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate> <a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((14749,18471), (33699,35567))</a:Rect> <a:Rect>((15653,18839), (32795,35199))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -4985,7 +4985,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623840859</a:CreationDate> <a:CreationDate>1623840859</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate> <a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((32440,-12234), (49660,2162))</a:Rect> <a:Rect>((33254,-11927), (48846,1855))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5010,7 +5010,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623841366</a:CreationDate> <a:CreationDate>1623841366</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate> <a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((32317,-26863), (49537,-12467))</a:Rect> <a:Rect>((33131,-26556), (48723,-12774))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5035,7 +5035,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623842834</a:CreationDate> <a:CreationDate>1623842834</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate> <a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((72334,37006), (96042,69402))</a:Rect> <a:Rect>((73486,37723), (94890,68685))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5060,7 +5060,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623845173</a:CreationDate> <a:CreationDate>1623845173</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate> <a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((96277,49454), (124745,66550))</a:Rect> <a:Rect>((97679,49822), (123343,66182))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5085,7 +5085,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623845296</a:CreationDate> <a:CreationDate>1623845296</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate> <a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((96086,38154), (115036,48050))</a:Rect> <a:Rect>((96990,38358), (114132,47846))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5110,7 +5110,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623859429</a:CreationDate> <a:CreationDate>1623859429</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate> <a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((125031,49262), (151335,67258))</a:Rect> <a:Rect>((126318,49651), (150048,66869))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5135,7 +5135,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623859834</a:CreationDate> <a:CreationDate>1623859834</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate> <a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((125429,37287), (146109,48083))</a:Rect> <a:Rect>((126423,37512), (145115,47858))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5187,7 +5187,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623860248</a:CreationDate> <a:CreationDate>1623860248</a:CreationDate>
<a:ModificationDate>1662449601</a:ModificationDate> <a:ModificationDate>1662449601</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((73569,-8788), (94683,8308))</a:Rect> <a:Rect>((74587,-8420), (93665,7940))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5212,7 +5212,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623860509</a:CreationDate> <a:CreationDate>1623860509</a:CreationDate>
<a:ModificationDate>1662971416</a:ModificationDate> <a:ModificationDate>1662971416</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((94707,-8538), (111495,7658))</a:Rect> <a:Rect>((95498,-8190), (110704,7310))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5237,7 +5237,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861067</a:CreationDate> <a:CreationDate>1623861067</a:CreationDate>
<a:ModificationDate>1662971416</a:ModificationDate> <a:ModificationDate>1662971416</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((113499,8387), (139803,26383))</a:Rect> <a:Rect>((114786,8776), (138516,25994))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5262,7 +5262,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861149</a:CreationDate> <a:CreationDate>1623861149</a:CreationDate>
<a:ModificationDate>1662971416</a:ModificationDate> <a:ModificationDate>1662971416</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((116611,-4663), (137291,6133))</a:Rect> <a:Rect>((117605,-4438), (136297,5908))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5287,7 +5287,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861203</a:CreationDate> <a:CreationDate>1623861203</a:CreationDate>
<a:ModificationDate>1662449601</a:ModificationDate> <a:ModificationDate>1662449601</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((140356,-5055), (155846,8441))</a:Rect> <a:Rect>((141079,-4769), (155123,8155))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5312,7 +5312,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861290</a:CreationDate> <a:CreationDate>1623861290</a:CreationDate>
<a:ModificationDate>1662971416</a:ModificationDate> <a:ModificationDate>1662971416</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((116311,-17563), (136991,-6767))</a:Rect> <a:Rect>((117305,-17338), (135997,-6992))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5364,7 +5364,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623862594</a:CreationDate> <a:CreationDate>1623862594</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate> <a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((57397,-26488), (70291,-14792))</a:Rect> <a:Rect>((57984,-26243), (69704,-15037))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5389,7 +5389,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623862978</a:CreationDate> <a:CreationDate>1623862978</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate> <a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((-37002,-12538), (-9400,958))</a:Rect> <a:Rect>((-35647,-12252), (-10755,672))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5414,7 +5414,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623863676</a:CreationDate> <a:CreationDate>1623863676</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate> <a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((-43569,-23338), (-30675,-14342))</a:Rect> <a:Rect>((-42982,-23154), (-31262,-14526))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5439,7 +5439,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623864141</a:CreationDate> <a:CreationDate>1623864141</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate> <a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((-29673,-23338), (-9857,-14342))</a:Rect> <a:Rect>((-28723,-23154), (-10807,-14526))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5464,7 +5464,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623895431</a:CreationDate> <a:CreationDate>1623895431</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate> <a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((-57383,-23188), (-44489,-14192))</a:Rect> <a:Rect>((-56796,-23004), (-45076,-14376))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5489,7 +5489,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1625926250</a:CreationDate> <a:CreationDate>1625926250</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate> <a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((42339,28637), (66913,46633))</a:Rect> <a:Rect>((43536,29026), (65716,46244))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5514,7 +5514,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1627129933</a:CreationDate> <a:CreationDate>1627129933</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate> <a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((97381,67314), (114169,74510))</a:Rect> <a:Rect>((98172,67457), (113378,74367))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5589,7 +5589,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628340137</a:CreationDate> <a:CreationDate>1628340137</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate> <a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((37596,20648), (49954,26044))</a:Rect> <a:Rect>((38210,20750), (49340,25942))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5639,7 +5639,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1631243538</a:CreationDate> <a:CreationDate>1631243538</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate> <a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((-7615,-23577), (4413,-15481))</a:Rect> <a:Rect>((-7073,-23414), (3871,-15644))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5664,7 +5664,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661850632</a:CreationDate> <a:CreationDate>1661850632</a:CreationDate>
<a:ModificationDate>1662449601</a:ModificationDate> <a:ModificationDate>1662449601</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((295266,51445), (321138,62241))</a:Rect> <a:Rect>((296531,51670), (319873,62016))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5689,7 +5689,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661872432</a:CreationDate> <a:CreationDate>1661872432</a:CreationDate>
<a:ModificationDate>1662047569</a:ModificationDate> <a:ModificationDate>1662047569</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((263687,41487), (288693,55883))</a:Rect> <a:Rect>((264907,41794), (287473,55576))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5768,7 +5768,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661949359</a:CreationDate> <a:CreationDate>1661949359</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate> <a:ModificationDate>1662042403</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((281953,22110), (309555,33806))</a:Rect> <a:Rect>((283308,22355), (308200,33561))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -5928,7 +5928,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661960474</a:CreationDate> <a:CreationDate>1661960474</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate> <a:ModificationDate>1662042403</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((288345,38233), (328059,48129))</a:Rect> <a:Rect>((290333,38437), (326071,47925))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -6358,7 +6358,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1663937886</a:CreationDate> <a:CreationDate>1663937886</a:CreationDate>
<a:ModificationDate>1663937955</a:ModificationDate> <a:ModificationDate>1663937955</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((36448,2552), (62752,20548))</a:Rect> <a:Rect>((37735,2941), (61465,20159))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -6383,7 +6383,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1664366421</a:CreationDate> <a:CreationDate>1664366421</a:CreationDate>
<a:ModificationDate>1664451284</a:ModificationDate> <a:ModificationDate>1664451284</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((225695,11532), (246805,22329))</a:Rect> <a:Rect>((226710,11757), (245790,22104))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -6408,7 +6408,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1664367261</a:CreationDate> <a:CreationDate>1664367261</a:CreationDate>
<a:ModificationDate>1664451269</a:ModificationDate> <a:ModificationDate>1664451269</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((240536,-26579), (256458,-11282))</a:Rect> <a:Rect>((241282,-26251), (255712,-11610))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -6433,7 +6433,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1664368015</a:CreationDate> <a:CreationDate>1664368015</a:CreationDate>
<a:ModificationDate>1664451368</a:ModificationDate> <a:ModificationDate>1664451368</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((194875,-1671), (215555,12726))</a:Rect> <a:Rect>((195869,-1364), (214561,12419))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -6458,7 +6458,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1664460832</a:CreationDate> <a:CreationDate>1664460832</a:CreationDate>
<a:ModificationDate>1664461120</a:ModificationDate> <a:ModificationDate>1664461120</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <a:IconMode>-1</a:IconMode>
<a:Rect>((277146,-42870), (300546,-12273))</a:Rect> <a:Rect>((277563,-42194), (300129,-12949))</a:Rect>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
@ -16770,11 +16770,11 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Column> </o:Column>
<o:Column Id="o947"> <o:Column Id="o947">
<a:ObjectID>D00F59E0-A483-453B-B382-AD18F74C0ABB</a:ObjectID> <a:ObjectID>D00F59E0-A483-453B-B382-AD18F74C0ABB</a:ObjectID>
<a:Name>from_id</a:Name> <a:Name>resources_question_snapshot_from_id</a:Name>
<a:Code>from_id</a:Code> <a:Code>resources_question_snapshot_from_id</a:Code>
<a:CreationDate>1563157584</a:CreationDate> <a:CreationDate>1563157584</a:CreationDate>
<a:Creator>lx</a:Creator> <a:Creator>lx</a:Creator>
<a:ModificationDate>1664174457</a:ModificationDate> <a:ModificationDate>1664507810</a:ModificationDate>
<a:Modifier>87966</a:Modifier> <a:Modifier>87966</a:Modifier>
<a:Comment>来源ID</a:Comment> <a:Comment>来源ID</a:Comment>
<a:DataType>bigint</a:DataType> <a:DataType>bigint</a:DataType>
@ -16787,11 +16787,11 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Column> </o:Column>
<o:Column Id="o948"> <o:Column Id="o948">
<a:ObjectID>4CD5F796-DD7D-4978-9E99-2F93C55A9DE6</a:ObjectID> <a:ObjectID>4CD5F796-DD7D-4978-9E99-2F93C55A9DE6</a:ObjectID>
<a:Name>from_type</a:Name> <a:Name>resources_question_snapshot_from_type</a:Name>
<a:Code>from_type</a:Code> <a:Code>resources_question_snapshot_from_type</a:Code>
<a:CreationDate>1663937890</a:CreationDate> <a:CreationDate>1663937890</a:CreationDate>
<a:Creator>lx</a:Creator> <a:Creator>lx</a:Creator>
<a:ModificationDate>1664174457</a:ModificationDate> <a:ModificationDate>1664507810</a:ModificationDate>
<a:Modifier>87966</a:Modifier> <a:Modifier>87966</a:Modifier>
<a:Comment>来源类型（HOMEWORK...）</a:Comment> <a:Comment>来源类型（HOMEWORK...）</a:Comment>
<a:DataType>varchar(100)</a:DataType> <a:DataType>varchar(100)</a:DataType>

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

@ -38,17 +38,16 @@ CREATE TABLE `sys_log_text` (
drop table if exists resources_question_snapshot;
/*==============================================================*/ /*==============================================================*/
/* Table: resources_question_snapshot */ /* Table: resources_question_snapshot */
/*==============================================================*/ /*==============================================================*/
drop table if exists resources_question_snapshot;
create table resources_question_snapshot create table resources_question_snapshot
( (
resources_question_snapshot_id bigint not null comment '题目快照ID', resources_question_snapshot_id bigint not null comment '题目快照ID',
from_id bigint not null comment '来源ID', resources_question_snapshot_from_id bigint not null comment '来源ID',
from_type varchar(100) not null comment '来源类型（HOMEWORK...）', resources_question_snapshot_from_type varchar(100) not null comment '来源类型（HOMEWORK...）',
course_info_id bigint comment '课程ID', course_info_id bigint comment '课程ID',
question_type int(2) comment '题型(1单选 2多选 3判断)', question_type int(2) comment '题型(1单选 2多选 3判断)',
question_score decimal(3,1) comment '分值', question_score decimal(3,1) comment '分值',
@ -73,6 +72,7 @@ COLLATE = utf8_general_ci;
alter table resources_question_snapshot comment '资源管理 - 题库管理-快照-关联来源'; alter table resources_question_snapshot comment '资源管理 - 题库管理-快照-关联来源';
ALTER TABLE hands_on ADD COLUMN add_time datetime COMMENT '添加时间'; ALTER TABLE hands_on ADD COLUMN add_time datetime COMMENT '添加时间';
ALTER TABLE hands_on ADD COLUMN org_id bigint(20) COMMENT '组织机构ID'; ALTER TABLE hands_on ADD COLUMN org_id bigint(20) COMMENT '组织机构ID';
ALTER TABLE hands_on ADD COLUMN user_id bigint(20) COMMENT '后台用户ID'; ALTER TABLE hands_on ADD COLUMN user_id bigint(20) COMMENT '后台用户ID';

26
web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionSnapshot.java
Unescape Escape View File

@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
import com.ibeetl.admin.core.annotation.DictEnum; import com.ibeetl.admin.core.annotation.DictEnum;
import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import org.beetl.sql.annotation.entity.AssignID; import org.beetl.sql.annotation.entity.AssignID;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -24,12 +24,12 @@ public class ResourcesQuestionSnapshot extends BaseEntity {
private Long resourcesQuestionSnapshotId ; private Long resourcesQuestionSnapshotId ;
//来源ID //来源ID
private Long fromId ; private Long resourcesQuestionSnapshotFromId;
//来源类型（HOMEWORK...） //来源类型（HOMEWORK...）
@DictEnum @DictEnum
private TeacherOpenCourseQuestionFromTypeEnum fromType ; private ResourcesQuestionSnapshotFromTypeEnum resourcesQuestionSnapshotFromType;
//课程ID //课程ID
@ -106,27 +106,27 @@ public class ResourcesQuestionSnapshot extends BaseEntity {
/**来源ID /**来源ID
*@return *@return
*/ */
public Long getFromId(){ public Long getResourcesQuestionSnapshotFromId(){
return fromId; return resourcesQuestionSnapshotFromId;
} }
/**来源ID /**来源ID
*@param fromId *@param resourcesQuestionSnapshotFromId
*/ */
public void setFromId(Long fromId){ public void setResourcesQuestionSnapshotFromId(Long resourcesQuestionSnapshotFromId){
this.fromId = fromId; this.resourcesQuestionSnapshotFromId = resourcesQuestionSnapshotFromId;
} }
/**来源类型（HOMEWORK...） /**来源类型（HOMEWORK...）
*@return *@return
*/ */
public TeacherOpenCourseQuestionFromTypeEnum getFromType(){ public ResourcesQuestionSnapshotFromTypeEnum getResourcesQuestionSnapshotFromType(){
return fromType; return resourcesQuestionSnapshotFromType;
} }
/**来源类型（HOMEWORK...） /**来源类型（HOMEWORK...）
*@param fromType *@param resourcesQuestionSnapshotFromType
*/ */
public void setFromType(TeacherOpenCourseQuestionFromTypeEnum fromType){ public void setResourcesQuestionSnapshotFromType(ResourcesQuestionSnapshotFromTypeEnum resourcesQuestionSnapshotFromType){
this.fromType = fromType; this.resourcesQuestionSnapshotFromType = resourcesQuestionSnapshotFromType;
} }
/**课程ID /**课程ID

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

@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import org.beetl.sql.annotation.entity.AssignID; import org.beetl.sql.annotation.entity.AssignID;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -24,11 +24,11 @@ public class TeacherOpenCourseQuestionLog extends BaseEntity{
//来源ID //来源ID
private Long teacherOpenCourseQuestionLogFromId ; private Long resourcesQuestionSnapshotFromId ;
//来源类型（枚举） //来源类型（枚举）
private TeacherOpenCourseQuestionFromTypeEnum teacherOpenCourseQuestionLogFromType ; private ResourcesQuestionSnapshotFromTypeEnum resourcesQuestionSnapshotFromType ;
//题目快照ID //题目快照ID
@ -83,26 +83,26 @@ public class TeacherOpenCourseQuestionLog extends BaseEntity{
*@return *@return
*/ */
public Long getTeacherOpenCourseQuestionLogFromId(){ public Long getTeacherOpenCourseQuestionLogFromId(){
return teacherOpenCourseQuestionLogFromId; return resourcesQuestionSnapshotFromId;
} }
/**来源ID /**来源ID
*@param teacherOpenCourseQuestionLogFromId *@param teacherOpenCourseQuestionLogFromId
*/ */
public void setTeacherOpenCourseQuestionLogFromId(Long teacherOpenCourseQuestionLogFromId){ public void setTeacherOpenCourseQuestionLogFromId(Long teacherOpenCourseQuestionLogFromId){
this.teacherOpenCourseQuestionLogFromId = teacherOpenCourseQuestionLogFromId; this.resourcesQuestionSnapshotFromId = teacherOpenCourseQuestionLogFromId;
} }
/**来源类型（枚举） /**来源类型（枚举）
*@return *@return
*/ */
public TeacherOpenCourseQuestionFromTypeEnum getTeacherOpenCourseQuestionLogFromType(){ public ResourcesQuestionSnapshotFromTypeEnum getTeacherOpenCourseQuestionLogFromType(){
return teacherOpenCourseQuestionLogFromType; return resourcesQuestionSnapshotFromType;
} }
/**来源类型（枚举） /**来源类型（枚举）
*@param teacherOpenCourseQuestionLogFromType *@param teacherOpenCourseQuestionLogFromType
*/ */
public void setTeacherOpenCourseQuestionLogFromType(TeacherOpenCourseQuestionFromTypeEnum teacherOpenCourseQuestionLogFromType){ public void setTeacherOpenCourseQuestionLogFromType(ResourcesQuestionSnapshotFromTypeEnum teacherOpenCourseQuestionLogFromType){
this.teacherOpenCourseQuestionLogFromType = teacherOpenCourseQuestionLogFromType; this.resourcesQuestionSnapshotFromType = teacherOpenCourseQuestionLogFromType;
} }
/**题目快照ID /**题目快照ID

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

@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import lombok.Data; import lombok.Data;
import org.beetl.sql.annotation.entity.Table; import org.beetl.sql.annotation.entity.Table;
import org.beetl.sql.fetch.annotation.Fetch; import org.beetl.sql.fetch.annotation.Fetch;
@ -24,10 +24,10 @@ public class TeacherOpenCourseQuestionLogScoreInfo extends BaseEntity {
/** ========================================================================= */ /** ========================================================================= */
/** ========== 这部分数据需要通过BeetlSQL来查询，才能自动触发FetchSql 注解 ========== */ /** ========== 这部分数据需要通过BeetlSQL来查询，才能自动触发FetchSql 注解 ========== */
//来源类型（枚举） //来源类型（枚举）
private TeacherOpenCourseQuestionFromTypeEnum teacherOpenCourseQuestionLogFromType ; private ResourcesQuestionSnapshotFromTypeEnum resourcesQuestionSnapshotFromType;
// 来源ID // 来源ID
private Long teacherOpenCourseQuestionLogFromId; private Long resourcesQuestionSnapshotFromId;
// 学生ID // 学生ID
private Long studentId; private Long studentId;

4
web/src/main/java/com/ibeetl/jlw/enums/TeacherOpenCourseQuestionFromTypeEnum.java → web/src/main/java/com/ibeetl/jlw/enums/ResourcesQuestionSnapshotFromTypeEnum.java
Unescape Escape View File

@ -13,7 +13,7 @@ import lombok.Getter;
* @date 2022/9/23 * @date 2022/9/23
* @modified * @modified
*/ */
public enum TeacherOpenCourseQuestionFromTypeEnum { public enum ResourcesQuestionSnapshotFromTypeEnum {
HOMEWORK("作业"), HOMEWORK("作业"),
@ -23,7 +23,7 @@ public enum TeacherOpenCourseQuestionFromTypeEnum {
@Getter @Getter
private String text; private String text;
TeacherOpenCourseQuestionFromTypeEnum(String text) { ResourcesQuestionSnapshotFromTypeEnum(String text) {
this.text = text; this.text = text;
} }
} }

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

@ -12,7 +12,7 @@ import com.ibeetl.jlw.dao.StudentDao;
import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot; import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot;
import com.ibeetl.jlw.entity.Student; import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLogScoreInfo; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLogScoreInfo;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import com.ibeetl.jlw.web.query.ResourcesQuestionSnapshotQuery; import com.ibeetl.jlw.web.query.ResourcesQuestionSnapshotQuery;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.SqlId; import org.beetl.sql.core.SqlId;
@ -95,9 +95,9 @@ public class ResourcesQuestionSnapshotService extends CoreBaseService<ResourcesQ
String msg = ""; String msg = "";
ResourcesQuestionSnapshot resourcesQuestionSnapshot = resourcesQuestionSnapshotQuery.pojo(); ResourcesQuestionSnapshot resourcesQuestionSnapshot = resourcesQuestionSnapshotQuery.pojo();
resourcesQuestionSnapshotDao.insert(resourcesQuestionSnapshot); resourcesQuestionSnapshotDao.insert(resourcesQuestionSnapshot);
resourcesQuestionSnapshotQuery.setFromId(resourcesQuestionSnapshot.getFromId()); resourcesQuestionSnapshotQuery.setResourcesQuestionSnapshotFromId(resourcesQuestionSnapshot.getResourcesQuestionSnapshotFromId());
JsonResult jsonResult = new JsonResult(); JsonResult jsonResult = new JsonResult();
jsonResult.setData(resourcesQuestionSnapshot.getFromId());//自增的ID丢进去 jsonResult.setData(resourcesQuestionSnapshot.getResourcesQuestionSnapshotFromId());//自增的ID丢进去
jsonResult.setCode(JsonReturnCode.SUCCESS.getCode()); jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
jsonResult.setMsg(msg); jsonResult.setMsg(msg);
return jsonResult; return jsonResult;
@ -133,7 +133,7 @@ public class ResourcesQuestionSnapshotService extends CoreBaseService<ResourcesQ
public ResourcesQuestionSnapshot getInfo (Long fromId){ public ResourcesQuestionSnapshot getInfo (Long fromId){
ResourcesQuestionSnapshotQuery resourcesQuestionSnapshotQuery = new ResourcesQuestionSnapshotQuery(); ResourcesQuestionSnapshotQuery resourcesQuestionSnapshotQuery = new ResourcesQuestionSnapshotQuery();
resourcesQuestionSnapshotQuery.setFromId(fromId); resourcesQuestionSnapshotQuery.setResourcesQuestionSnapshotFromId(fromId);
List<ResourcesQuestionSnapshot> list = resourcesQuestionSnapshotDao.getValuesByQuery(resourcesQuestionSnapshotQuery); List<ResourcesQuestionSnapshot> list = resourcesQuestionSnapshotDao.getValuesByQuery(resourcesQuestionSnapshotQuery);
if(null != list && list.size()>0){ if(null != list && list.size()>0){
return list.get(0); return list.get(0);
@ -155,25 +155,23 @@ public class ResourcesQuestionSnapshotService extends CoreBaseService<ResourcesQ
* 学生端-开课相关 * 学生端-开课相关
* 查询学生的得分信息 * 查询学生的得分信息
* *
* @param fromId * @param snapshotFromId
* @param fromType * @param snapshotFromType
* @return * @return
*/ */
public TeacherOpenCourseQuestionLogScoreInfo getScoreInfo(final Long fromId, final TeacherOpenCourseQuestionFromTypeEnum fromType) { public TeacherOpenCourseQuestionLogScoreInfo getScoreInfo(final Long snapshotFromId, final ResourcesQuestionSnapshotFromTypeEnum snapshotFromType) {
// ResourcesQuestionSnapshotQuery resourcesQuestionSnapshotQuery = new ResourcesQuestionSnapshotQuery();
// resourcesQuestionSnapshotQuery.setFromId(fromId);
// resourcesQuestionSnapshotQuery.setFromType(fromType);
// List<ResourcesQuestionSnapshot> valuesByQuery = getValuesByQuery(resourcesQuestionSnapshotQuery);
// 查询学生身份 // 查询学生身份
Student student = studentDao.getByUserId(getUserId()); Student student = studentDao.getByUserId(getUserId());
TeacherOpenCourseQuestionLogScoreInfo teacherOpenCourseQuestionLogScoreInfo = new TeacherOpenCourseQuestionLogScoreInfo(); TeacherOpenCourseQuestionLogScoreInfo teacherOpenCourseQuestionLogScoreInfo = new TeacherOpenCourseQuestionLogScoreInfo();
teacherOpenCourseQuestionLogScoreInfo.setStudentId(student.getStudentId()); teacherOpenCourseQuestionLogScoreInfo.setStudentId(student.getStudentId());
teacherOpenCourseQuestionLogScoreInfo.setTeacherOpenCourseQuestionLogFromId(fromId); teacherOpenCourseQuestionLogScoreInfo.setResourcesQuestionSnapshotFromId(snapshotFromId);
teacherOpenCourseQuestionLogScoreInfo.setTeacherOpenCourseQuestionLogFromType(fromType); teacherOpenCourseQuestionLogScoreInfo.setResourcesQuestionSnapshotFromType(snapshotFromType);
// 查询符合条件的实体 // 查询符合条件的实体
TeacherOpenCourseQuestionLogScoreInfo scoreInfo = sqlManager.templateOne(teacherOpenCourseQuestionLogScoreInfo); TeacherOpenCourseQuestionLogScoreInfo scoreInfo = sqlManager.execute(
"select * from ",
teacherOpenCourseQuestionLogScoreInfo);
return scoreInfo; return scoreInfo;
} }

2
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkService.java
Unescape Escape View File

@ -201,7 +201,7 @@ public class TeacherOpenCourseHomeworkService extends CoreBaseService<TeacherOpe
TeacherOpenCourseHomeworkSetting hwSetting = teacherOpenCourseHomeworkSettingService.getInfo(settingQuery); TeacherOpenCourseHomeworkSetting hwSetting = teacherOpenCourseHomeworkSettingService.getInfo(settingQuery);
ResourcesQuestionSnapshotQuery questionSnapshotQuery = new ResourcesQuestionSnapshotQuery(); ResourcesQuestionSnapshotQuery questionSnapshotQuery = new ResourcesQuestionSnapshotQuery();
questionSnapshotQuery.setFromId(teacherOpenCourseHomeworkId); questionSnapshotQuery.setResourcesQuestionSnapshotFromId(teacherOpenCourseHomeworkId);
// 作答次数 // 作答次数
if (TRUE_CONST.equals(hwSetting.getTeacherOpenCourseHomeworkSettingDoCount())) { if (TRUE_CONST.equals(hwSetting.getTeacherOpenCourseHomeworkSettingDoCount())) {

10
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkSettingService.java
Unescape Escape View File

@ -15,7 +15,7 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseHomeworkSettingDao;
import com.ibeetl.jlw.entity.ResourcesQuestion; import com.ibeetl.jlw.entity.ResourcesQuestion;
import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot; import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot;
import com.ibeetl.jlw.entity.TeacherOpenCourseHomeworkSetting; import com.ibeetl.jlw.entity.TeacherOpenCourseHomeworkSetting;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import com.ibeetl.jlw.web.query.ResourcesQuestionQuery; import com.ibeetl.jlw.web.query.ResourcesQuestionQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkSettingQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkSettingQuery;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -111,7 +111,7 @@ public class TeacherOpenCourseHomeworkSettingService extends CoreBaseService<Tea
* 插入题目快照 * 插入题目快照
* @param query * @param query
*/ */
private void insertQuestionSnapshot(TeacherOpenCourseHomeworkSettingQuery query, TeacherOpenCourseQuestionFromTypeEnum fromType) { private void insertQuestionSnapshot(TeacherOpenCourseHomeworkSettingQuery query, ResourcesQuestionSnapshotFromTypeEnum fromType) {
// 查询题目ID对应的题目列表 // 查询题目ID对应的题目列表
ResourcesQuestionQuery resourcesQuestionQuery = new ResourcesQuestionQuery(); ResourcesQuestionQuery resourcesQuestionQuery = new ResourcesQuestionQuery();
resourcesQuestionQuery.setResourcesQuestionIds(query.getResourcesQuestionIdPlural()); resourcesQuestionQuery.setResourcesQuestionIds(query.getResourcesQuestionIdPlural());
@ -124,9 +124,9 @@ public class TeacherOpenCourseHomeworkSettingService extends CoreBaseService<Tea
// 遍历处理 // 遍历处理
for (ResourcesQuestionSnapshot questionSnapshot : questionSnapshots) { for (ResourcesQuestionSnapshot questionSnapshot : questionSnapshots) {
// 标记关联快照 // 标记关联快照
questionSnapshot.setFromType(fromType); questionSnapshot.setResourcesQuestionSnapshotFromType(fromType);
// 快照关联作业ID // 快照关联作业ID
questionSnapshot.setFromId(query.getTeacherOpenCourseHomeworkId()); questionSnapshot.setResourcesQuestionSnapshotFromId(query.getTeacherOpenCourseHomeworkId());
} }
// 保存到题目快照表 // 保存到题目快照表
@ -191,6 +191,6 @@ public class TeacherOpenCourseHomeworkSettingService extends CoreBaseService<Tea
add(teacherOpenCourseHomeworkSettingQuery); add(teacherOpenCourseHomeworkSettingQuery);
// 插入题目快照 // 插入题目快照
insertQuestionSnapshot(teacherOpenCourseHomeworkSettingQuery, TeacherOpenCourseQuestionFromTypeEnum.HOMEWORK); insertQuestionSnapshot(teacherOpenCourseHomeworkSettingQuery, ResourcesQuestionSnapshotFromTypeEnum.HOMEWORK);
} }
} }

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

@ -11,7 +11,7 @@ import com.ibeetl.jlw.dao.StudentDao;
import com.ibeetl.jlw.dao.TeacherOpenCourseQuestionLogDao; import com.ibeetl.jlw.dao.TeacherOpenCourseQuestionLogDao;
import com.ibeetl.jlw.entity.Student; import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogQuery;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.SqlId; import org.beetl.sql.core.SqlId;
@ -157,7 +157,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
* @param questionLogMap <题目ID, [数组：前端传递过来不需要考虑排序和重复问题]> 例： {"10086": ["D", "A", "B", "A"]} * @param questionLogMap <题目ID, [数组：前端传递过来不需要考虑排序和重复问题]> 例： {"10086": ["D", "A", "B", "A"]}
* @param fromType 来源类型 * @param fromType 来源类型
*/ */
public void addQuestionLog(Map<Long, TreeSet<String>> questionLogMap, final TeacherOpenCourseQuestionFromTypeEnum fromType) { public void addQuestionLog(Map<Long, TreeSet<String>> questionLogMap, final ResourcesQuestionSnapshotFromTypeEnum fromType) {
// 查询学生身份 // 查询学生身份
Student student = studentDao.getByUserId(getUserId()); Student student = studentDao.getByUserId(getUserId());

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

@ -9,7 +9,7 @@ import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot; import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLogScoreInfo; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLogScoreInfo;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import com.ibeetl.jlw.service.ResourcesQuestionSnapshotService; import com.ibeetl.jlw.service.ResourcesQuestionSnapshotService;
import com.ibeetl.jlw.web.query.ResourcesQuestionSnapshotQuery; import com.ibeetl.jlw.web.query.ResourcesQuestionSnapshotQuery;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -198,8 +198,8 @@ public class ResourcesQuestionSnapshotController{
* 查询分数信息 * 查询分数信息
* 支持根据来源类型查询 * 支持根据来源类型查询
* *
* @param fromId 来源ID 可以是作业、考试、章节练习 * @param snapshotFromId 题目快照 来源ID 可以是作业、考试、章节练习
* @param fromType * @param snapshotFromType 题目快照类型
* @param coreUser * @param coreUser
* @return * @return
*/ */
@ -208,13 +208,13 @@ public class ResourcesQuestionSnapshotController{
@ResponseBody @ResponseBody
public JsonResult<TeacherOpenCourseQuestionLogScoreInfo> getScoreInfo( public JsonResult<TeacherOpenCourseQuestionLogScoreInfo> getScoreInfo(
@NotEmpty(message = "请上传来源ID：[开课作业ID、开课考试ID、开课章节测试ID]！") @NotEmpty(message = "请上传来源ID：[开课作业ID、开课考试ID、开课章节测试ID]！")
Long fromId, Long snapshotFromId,
@NotNull(message = "来源类型不能为空！") @NotNull(message = "来源类型不能为空！")
TeacherOpenCourseQuestionFromTypeEnum fromType, ResourcesQuestionSnapshotFromTypeEnum snapshotFromType,
@SCoreUser @SCoreUser
CoreUser coreUser) { CoreUser coreUser) {
Assert.isTrue(coreUser.isStudent(), "非学生身份，无法提交!"); Assert.isTrue(coreUser.isStudent(), "非学生身份，无法提交!");
return JsonResult.success(resourcesQuestionSnapshotService.getScoreInfo(fromId, fromType)); return JsonResult.success(resourcesQuestionSnapshotService.getScoreInfo(snapshotFromId, snapshotFromType));
} }

4
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java
Unescape Escape View File

@ -8,7 +8,7 @@ import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.file.FileService; import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import com.ibeetl.jlw.service.TeacherOpenCourseQuestionLogService; import com.ibeetl.jlw.service.TeacherOpenCourseQuestionLogService;
import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogQuery;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -212,7 +212,7 @@ public class TeacherOpenCourseQuestionLogController{
@RequestBody @NotEmpty(message = "请上传题目快照ID和答案！") @RequestBody @NotEmpty(message = "请上传题目快照ID和答案！")
Map<Long, TreeSet<String>> questionLogMap, Map<Long, TreeSet<String>> questionLogMap,
@NotNull(message = "来源类型不能为空！") @NotNull(message = "来源类型不能为空！")
TeacherOpenCourseQuestionFromTypeEnum fromType, ResourcesQuestionSnapshotFromTypeEnum fromType,
@SCoreUser @SCoreUser
CoreUser coreUser) { CoreUser coreUser) {
Assert.isTrue(coreUser.isStudent(), "非学生身份，无法提交!"); Assert.isTrue(coreUser.isStudent(), "非学生身份，无法提交!");

26
web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java
Unescape Escape View File

@ -4,7 +4,7 @@ import cn.jlw.validate.ValidateConfig;
import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.admin.core.web.query.PageParam;
import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot; import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -17,9 +17,9 @@ public class ResourcesQuestionSnapshotQuery extends PageParam {
@Query(name = "题目快照ID", display = false) @Query(name = "题目快照ID", display = false)
private Long resourcesQuestionSnapshotId; private Long resourcesQuestionSnapshotId;
@Query(name = "来源ID", display = false) @Query(name = "来源ID", display = false)
private Long fromId; private Long resourcesQuestionSnapshotFromId;
@Query(name = "来源类型（HOMEWORK...）", display = false) @Query(name = "来源类型（HOMEWORK...）", display = false)
private TeacherOpenCourseQuestionFromTypeEnum fromType; private ResourcesQuestionSnapshotFromTypeEnum resourcesQuestionSnapshotFromType;
@Query(name = "课程ID", display = false) @Query(name = "课程ID", display = false)
private Long courseInfoId; private Long courseInfoId;
@Query(name = "题型(1单选 2多选 3判断)", display = false) @Query(name = "题型(1单选 2多选 3判断)", display = false)
@ -71,17 +71,17 @@ public class ResourcesQuestionSnapshotQuery extends PageParam {
public void setResourcesQuestionSnapshotId(Long resourcesQuestionSnapshotId ){ public void setResourcesQuestionSnapshotId(Long resourcesQuestionSnapshotId ){
this.resourcesQuestionSnapshotId = resourcesQuestionSnapshotId; this.resourcesQuestionSnapshotId = resourcesQuestionSnapshotId;
} }
public Long getFromId(){ public Long getResourcesQuestionSnapshotFromId(){
return fromId; return resourcesQuestionSnapshotFromId;
} }
public void setFromId(Long fromId ){ public void setResourcesQuestionSnapshotFromId(Long resourcesQuestionSnapshotFromId){
this.fromId = fromId; this.resourcesQuestionSnapshotFromId = resourcesQuestionSnapshotFromId;
} }
public TeacherOpenCourseQuestionFromTypeEnum getFromType(){ public ResourcesQuestionSnapshotFromTypeEnum getResourcesQuestionSnapshotFromType(){
return fromType; return resourcesQuestionSnapshotFromType;
} }
public void setFromType(TeacherOpenCourseQuestionFromTypeEnum fromType ){ public void setResourcesQuestionSnapshotFromType(ResourcesQuestionSnapshotFromTypeEnum resourcesQuestionSnapshotFromType){
this.fromType = fromType; this.resourcesQuestionSnapshotFromType = resourcesQuestionSnapshotFromType;
} }
public Long getCourseInfoId(){ public Long getCourseInfoId(){
return courseInfoId; return courseInfoId;
@ -171,8 +171,8 @@ public class ResourcesQuestionSnapshotQuery extends PageParam {
public ResourcesQuestionSnapshot pojo(){ public ResourcesQuestionSnapshot pojo(){
ResourcesQuestionSnapshot pojo = new ResourcesQuestionSnapshot(); ResourcesQuestionSnapshot pojo = new ResourcesQuestionSnapshot();
pojo.setResourcesQuestionSnapshotId(this.getResourcesQuestionSnapshotId()); pojo.setResourcesQuestionSnapshotId(this.getResourcesQuestionSnapshotId());
pojo.setFromId(this.getFromId()); pojo.setResourcesQuestionSnapshotFromId(this.getResourcesQuestionSnapshotFromId());
pojo.setFromType(this.getFromType()); pojo.setResourcesQuestionSnapshotFromType(this.getResourcesQuestionSnapshotFromType());
pojo.setCourseInfoId(this.getCourseInfoId()); pojo.setCourseInfoId(this.getCourseInfoId());
pojo.setQuestionType(this.getQuestionType()); pojo.setQuestionType(this.getQuestionType());
pojo.setQuestionScore(this.getQuestionScore()); pojo.setQuestionScore(this.getQuestionScore());

26
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java
Unescape Escape View File

@ -5,7 +5,7 @@ import com.ibeetl.admin.core.annotation.DictEnum;
import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.admin.core.web.query.PageParam;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
@ -18,10 +18,10 @@ public class TeacherOpenCourseQuestionLogQuery extends PageParam {
@Query(name = "学生做题日志ID", display = false) @Query(name = "学生做题日志ID", display = false)
private Long teacherOpenCourseQuestionLogId; private Long teacherOpenCourseQuestionLogId;
@Query(name = "来源ID", display = false) @Query(name = "来源ID", display = false)
private Long teacherOpenCourseQuestionLogFromId; private Long resourcesQuestionSnapshotFromId;
@Query(name = "来源类型（枚举）", display = false) @Query(name = "来源类型（枚举）", display = false)
@DictEnum @DictEnum
private TeacherOpenCourseQuestionFromTypeEnum teacherOpenCourseQuestionLogFromType; private ResourcesQuestionSnapshotFromTypeEnum resourcesQuestionSnapshotFromType;
@Query(name = "题目快照ID", display = false) @Query(name = "题目快照ID", display = false)
private Long resourcesQuestionSnapshotId; private Long resourcesQuestionSnapshotId;
@Query(name = "学生提交的答案", display = false) @Query(name = "学生提交的答案", display = false)
@ -57,17 +57,17 @@ public class TeacherOpenCourseQuestionLogQuery extends PageParam {
public void setTeacherOpenCourseQuestionLogId(Long teacherOpenCourseQuestionLogId ){ public void setTeacherOpenCourseQuestionLogId(Long teacherOpenCourseQuestionLogId ){
this.teacherOpenCourseQuestionLogId = teacherOpenCourseQuestionLogId; this.teacherOpenCourseQuestionLogId = teacherOpenCourseQuestionLogId;
} }
public Long getTeacherOpenCourseQuestionLogFromId(){ public Long getResourcesQuestionSnapshotFromId(){
return teacherOpenCourseQuestionLogFromId; return resourcesQuestionSnapshotFromId;
} }
public void setTeacherOpenCourseQuestionLogFromId(Long teacherOpenCourseQuestionLogFromId ){ public void setResourcesQuestionSnapshotFromId(Long resourcesQuestionSnapshotFromId){
this.teacherOpenCourseQuestionLogFromId = teacherOpenCourseQuestionLogFromId; this.resourcesQuestionSnapshotFromId = resourcesQuestionSnapshotFromId;
} }
public TeacherOpenCourseQuestionFromTypeEnum getTeacherOpenCourseQuestionLogFromType(){ public ResourcesQuestionSnapshotFromTypeEnum getResourcesQuestionSnapshotFromType(){
return teacherOpenCourseQuestionLogFromType; return resourcesQuestionSnapshotFromType;
} }
public void setTeacherOpenCourseQuestionLogFromType(TeacherOpenCourseQuestionFromTypeEnum teacherOpenCourseQuestionLogFromType ){ public void setResourcesQuestionSnapshotFromType(ResourcesQuestionSnapshotFromTypeEnum resourcesQuestionSnapshotFromType){
this.teacherOpenCourseQuestionLogFromType = teacherOpenCourseQuestionLogFromType; this.resourcesQuestionSnapshotFromType = resourcesQuestionSnapshotFromType;
} }
public Long getResourcesQuestionSnapshotId(){ public Long getResourcesQuestionSnapshotId(){
return resourcesQuestionSnapshotId; return resourcesQuestionSnapshotId;
@ -121,8 +121,8 @@ public class TeacherOpenCourseQuestionLogQuery extends PageParam {
public TeacherOpenCourseQuestionLog pojo(){ public TeacherOpenCourseQuestionLog pojo(){
TeacherOpenCourseQuestionLog pojo = new TeacherOpenCourseQuestionLog(); TeacherOpenCourseQuestionLog pojo = new TeacherOpenCourseQuestionLog();
pojo.setTeacherOpenCourseQuestionLogId(this.getTeacherOpenCourseQuestionLogId()); pojo.setTeacherOpenCourseQuestionLogId(this.getTeacherOpenCourseQuestionLogId());
pojo.setTeacherOpenCourseQuestionLogFromId(this.getTeacherOpenCourseQuestionLogFromId()); pojo.setTeacherOpenCourseQuestionLogFromId(this.getResourcesQuestionSnapshotFromId());
pojo.setTeacherOpenCourseQuestionLogFromType(this.getTeacherOpenCourseQuestionLogFromType()); pojo.setTeacherOpenCourseQuestionLogFromType(this.getResourcesQuestionSnapshotFromType());
pojo.setResourcesQuestionSnapshotId(this.getResourcesQuestionSnapshotId()); pojo.setResourcesQuestionSnapshotId(this.getResourcesQuestionSnapshotId());
pojo.setTeacherOpenCourseQuestionLogAnswer(this.getTeacherOpenCourseQuestionLogAnswer()); pojo.setTeacherOpenCourseQuestionLogAnswer(this.getTeacherOpenCourseQuestionLogAnswer());
pojo.setTeacherOpenCourseQuestionLogUploadFile(this.getTeacherOpenCourseQuestionLogUploadFile()); pojo.setTeacherOpenCourseQuestionLogUploadFile(this.getTeacherOpenCourseQuestionLogUploadFile());

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

@ -13,14 +13,14 @@ queryByCondition
@if(!isEmpty(resourcesQuestionSnapshotId)){ @if(!isEmpty(resourcesQuestionSnapshotId)){
and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId# and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId#
@} @}
@if(!isEmpty(fromId)){ @if(!isEmpty(resourcesQuestionSnapshotFromId)){
and t.from_id =#fromId# and t.resources_question_snapshot_from_id =#resourcesQuestionSnapshotFromId#
@} @}
@if(!isEmpty(fromIdPlural)){ @if(!isEmpty(fromIdPlural)){
and find_in_set(t.from_id,#fromIdPlural#) and find_in_set(t.resources_question_snapshot_from_id,#fromIdPlural#)x
@} @}
@if(!isEmpty(fromType)){ @if(!isEmpty(resourcesQuestionSnapshotFromType)){
and t.from_type =#fromType# and t.resources_question_snapshot_from_type =#resourcesQuestionSnapshotFromType#
@} @}
@if(!isEmpty(courseInfoId)){ @if(!isEmpty(courseInfoId)){
and t.course_info_id =#courseInfoId# and t.course_info_id =#courseInfoId#
@ -94,14 +94,14 @@ queryByConditionQuery
@if(!isEmpty(resourcesQuestionSnapshotId)){ @if(!isEmpty(resourcesQuestionSnapshotId)){
and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId# and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId#
@} @}
@if(!isEmpty(fromId)){ @if(!isEmpty(resourcesQuestionSnapshotFromId)){
and t.from_id =#fromId# and t.resources_question_snapshot_from_id =#resourcesQuestionSnapshotFromId#
@} @}
@if(!isEmpty(fromIdPlural)){ @if(!isEmpty(fromIdPlural)){
and find_in_set(t.from_id,#fromIdPlural#) and find_in_set(t.resources_question_snapshot_from_id,#fromIdPlural#)
@} @}
@if(!isEmpty(fromType)){ @if(!isEmpty(resourcesQuestionSnapshotFromType)){
and t.from_type =#fromType# and t.resources_question_snapshot_from_type =#resourcesQuestionSnapshotFromType#
@} @}
@if(!isEmpty(courseInfoId)){ @if(!isEmpty(courseInfoId)){
and t.course_info_id =#courseInfoId# and t.course_info_id =#courseInfoId#
@ -169,14 +169,14 @@ deleteResourcesQuestionSnapshotByIds
* 批量删除 * 批量删除
delete from resources_question_snapshot where find_in_set(from_id,#ids#) delete from resources_question_snapshot where find_in_set(resources_question_snapshot_from_id,#ids#)
getByIds getByIds
=== ===
select * from resources_question_snapshot where find_in_set(from_id,#ids#) select * from resources_question_snapshot where find_in_set(resources_question_snapshot_from_id,#ids#)
updateGivenByIds updateGivenByIds
@ -193,11 +193,11 @@ updateGivenByIds
resources_question_snapshot_id = #resourcesQuestionSnapshotId# , resources_question_snapshot_id = #resourcesQuestionSnapshotId# ,
@} @}
@} @}
@if(contain("fromType",_given)){ @if(contain("resourcesQuestionSnapshotFromType",_given)){
@if(isEmpty(fromType)){ @if(isEmpty(resourcesQuestionSnapshotFromType)){
from_type = null , resources_question_snapshot_from_type = null ,
@}else{ @}else{
from_type = #fromType# , resources_question_snapshot_from_type = #resourcesQuestionSnapshotFromType# ,
@} @}
@} @}
@if(contain("courseInfoId",_given)){ @if(contain("courseInfoId",_given)){
@ -298,8 +298,8 @@ updateGivenByIds
org_id = #orgId# , org_id = #orgId# ,
@} @}
@} @}
from_id = from_id resources_question_snapshot_from_id = resources_question_snapshot_from_id
where find_in_set(from_id,#fromIdPlural#) where find_in_set(resources_question_snapshot_from_id,#fromIdPlural#)
@ -314,11 +314,11 @@ getResourcesQuestionSnapshotValues
@if(!isEmpty(resourcesQuestionSnapshotId)){ @if(!isEmpty(resourcesQuestionSnapshotId)){
and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId# and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId#
@} @}
@if(!isEmpty(fromId)){ @if(!isEmpty(resourcesQuestionSnapshotFromId)){
and t.from_id =#fromId# and t.resources_question_snapshot_from_id =#resourcesQuestionSnapshotFromId#
@} @}
@if(!isEmpty(fromType)){ @if(!isEmpty(resourcesQuestionSnapshotFromType)){
and t.from_type =#fromType# and t.resources_question_snapshot_from_type =#resourcesQuestionSnapshotFromType#
@} @}
@if(!isEmpty(courseInfoId)){ @if(!isEmpty(courseInfoId)){
and t.course_info_id =#courseInfoId# and t.course_info_id =#courseInfoId#
@ -375,14 +375,14 @@ getValuesByQuery
@if(!isEmpty(resourcesQuestionSnapshotId)){ @if(!isEmpty(resourcesQuestionSnapshotId)){
and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId# and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId#
@} @}
@if(!isEmpty(fromId)){ @if(!isEmpty(resourcesQuestionSnapshotFromId)){
and t.from_id =#fromId# and t.resources_question_snapshot_from_id =#resourcesQuestionSnapshotFromId#
@} @}
@if(!isEmpty(fromIdPlural)){ @if(!isEmpty(fromIdPlural)){
and find_in_set(t.from_id,#fromIdPlural#) and find_in_set(t.resources_question_snapshot_from_id,#fromIdPlural#)
@} @}
@if(!isEmpty(fromType)){ @if(!isEmpty(resourcesQuestionSnapshotFromType)){
and t.from_type =#fromType# and t.resources_question_snapshot_from_type =#resourcesQuestionSnapshotFromType#
@} @}
@if(!isEmpty(courseInfoId)){ @if(!isEmpty(courseInfoId)){
and t.course_info_id =#courseInfoId# and t.course_info_id =#courseInfoId#

60
web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md
Unescape Escape View File

@ -16,14 +16,14 @@ queryByCondition
@if(!isEmpty(teacherOpenCourseQuestionLogIdPlural)){ @if(!isEmpty(teacherOpenCourseQuestionLogIdPlural)){
and find_in_set(t.teacher_open_course_question_log_id,#teacherOpenCourseQuestionLogIdPlural#) and find_in_set(t.teacher_open_course_question_log_id,#teacherOpenCourseQuestionLogIdPlural#)
@} @}
@if(!isEmpty(teacherOpenCourseQuestionLogFromId)){ @if(!isEmpty(resourcesQuestionSnapshotFromId)){
and t.teacher_open_course_question_log_from_id =#teacherOpenCourseQuestionLogFromId# and t.resources_question_snapshot_from_id =#resourcesQuestionSnapshotFromId#
@} @}
@if(!isEmpty(teacherOpenCourseQuestionLogFromIdPlural)){ @if(!isEmpty(resourcesQuestionSnapshotFromIdPlural)){
and find_in_set(t.teacher_open_course_question_log_from_id,#teacherOpenCourseQuestionLogFromIdPlural#) and find_in_set(t.resources_question_snapshot_from_id,#resourcesQuestionSnapshotFromIdPlural#)
@} @}
@if(!isEmpty(teacherOpenCourseQuestionLogFromType)){ @if(!isEmpty(resourcesQuestionSnapshotFromType)){
and t.teacher_open_course_question_log_from_type =#teacherOpenCourseQuestionLogFromType# and t.resources_question_snapshot_from_type =#resourcesQuestionSnapshotFromType#
@} @}
@if(!isEmpty(resourcesQuestionSnapshotId)){ @if(!isEmpty(resourcesQuestionSnapshotId)){
and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId# and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId#
@ -85,14 +85,14 @@ queryByConditionQuery
@if(!isEmpty(teacherOpenCourseQuestionLogIdPlural)){ @if(!isEmpty(teacherOpenCourseQuestionLogIdPlural)){
and find_in_set(t.teacher_open_course_question_log_id,#teacherOpenCourseQuestionLogIdPlural#) and find_in_set(t.teacher_open_course_question_log_id,#teacherOpenCourseQuestionLogIdPlural#)
@} @}
@if(!isEmpty(teacherOpenCourseQuestionLogFromId)){ @if(!isEmpty(resourcesQuestionSnapshotFromId)){
and t.teacher_open_course_question_log_from_id =#teacherOpenCourseQuestionLogFromId# and t.resources_question_snapshot_from_id =#resourcesQuestionSnapshotFromId#
@} @}
@if(!isEmpty(teacherOpenCourseQuestionLogFromIdPlural)){ @if(!isEmpty(resourcesQuestionSnapshotFromIdPlural)){
and find_in_set(t.teacher_open_course_question_log_from_id,#teacherOpenCourseQuestionLogFromIdPlural#) and find_in_set(t.resources_question_snapshot_from_id,#resourcesQuestionSnapshotFromIdPlural#)
@} @}
@if(!isEmpty(teacherOpenCourseQuestionLogFromType)){ @if(!isEmpty(resourcesQuestionSnapshotFromType)){
and t.teacher_open_course_question_log_from_type =#teacherOpenCourseQuestionLogFromType# and t.resources_question_snapshot_from_type =#resourcesQuestionSnapshotFromType#
@} @}
@if(!isEmpty(resourcesQuestionSnapshotId)){ @if(!isEmpty(resourcesQuestionSnapshotId)){
and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId# and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId#
@ -170,18 +170,18 @@ updateGivenByIds
update teacher_open_course_question_log update teacher_open_course_question_log
set set
@if(contain("teacherOpenCourseQuestionLogFromId",_given)){ @if(contain("resourcesQuestionSnapshotFromId",_given)){
@if(isEmpty(teacherOpenCourseQuestionLogFromId)){ @if(isEmpty(resourcesQuestionSnapshotFromId)){
teacher_open_course_question_log_from_id = null , resources_question_snapshot_from_id = null ,
@}else{ @}else{
teacher_open_course_question_log_from_id = #teacherOpenCourseQuestionLogFromId# , resources_question_snapshot_from_id = #resourcesQuestionSnapshotFromId# ,
@} @}
@} @}
@if(contain("teacherOpenCourseQuestionLogFromType",_given)){ @if(contain("resourcesQuestionSnapshotFromType",_given)){
@if(isEmpty(teacherOpenCourseQuestionLogFromType)){ @if(isEmpty(resourcesQuestionSnapshotFromType)){
teacher_open_course_question_log_from_type = null , resources_question_snapshot_from_type = null ,
@}else{ @}else{
teacher_open_course_question_log_from_type = #teacherOpenCourseQuestionLogFromType# , resources_question_snapshot_from_type = #resourcesQuestionSnapshotFromType# ,
@} @}
@} @}
@if(contain("resourcesQuestionSnapshotId",_given)){ @if(contain("resourcesQuestionSnapshotId",_given)){
@ -256,11 +256,11 @@ getTeacherOpenCourseQuestionLogValues
@if(!isEmpty(teacherOpenCourseQuestionLogId)){ @if(!isEmpty(teacherOpenCourseQuestionLogId)){
and t.teacher_open_course_question_log_id =#teacherOpenCourseQuestionLogId# and t.teacher_open_course_question_log_id =#teacherOpenCourseQuestionLogId#
@} @}
@if(!isEmpty(teacherOpenCourseQuestionLogFromId)){ @if(!isEmpty(resourcesQuestionSnapshotFromId)){
and t.teacher_open_course_question_log_from_id =#teacherOpenCourseQuestionLogFromId# and t.resources_question_snapshot_from_id =#resourcesQuestionSnapshotFromId#
@} @}
@if(!isEmpty(teacherOpenCourseQuestionLogFromType)){ @if(!isEmpty(resourcesQuestionSnapshotFromType)){
and t.teacher_open_course_question_log_from_type =#teacherOpenCourseQuestionLogFromType# and t.resources_question_snapshot_from_type =#resourcesQuestionSnapshotFromType#
@} @}
@if(!isEmpty(resourcesQuestionSnapshotId)){ @if(!isEmpty(resourcesQuestionSnapshotId)){
and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId# and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId#
@ -304,14 +304,14 @@ getValuesByQuery
@if(!isEmpty(teacherOpenCourseQuestionLogIdPlural)){ @if(!isEmpty(teacherOpenCourseQuestionLogIdPlural)){
and find_in_set(t.teacher_open_course_question_log_id,#teacherOpenCourseQuestionLogIdPlural#) and find_in_set(t.teacher_open_course_question_log_id,#teacherOpenCourseQuestionLogIdPlural#)
@} @}
@if(!isEmpty(teacherOpenCourseQuestionLogFromId)){ @if(!isEmpty(resourcesQuestionSnapshotFromId)){
and t.teacher_open_course_question_log_from_id =#teacherOpenCourseQuestionLogFromId# and t.resources_question_snapshot_from_id =#resourcesQuestionSnapshotFromId#
@} @}
@if(!isEmpty(teacherOpenCourseQuestionLogFromIdPlural)){ @if(!isEmpty(resourcesQuestionSnapshotFromIdPlural)){
and find_in_set(t.teacher_open_course_question_log_from_id,#teacherOpenCourseQuestionLogFromIdPlural#) and find_in_set(t.resources_question_snapshot_from_id,#resourcesQuestionSnapshotFromIdPlural#)
@} @}
@if(!isEmpty(teacherOpenCourseQuestionLogFromType)){ @if(!isEmpty(resourcesQuestionSnapshotFromType)){
and t.teacher_open_course_question_log_from_type =#teacherOpenCourseQuestionLogFromType# and t.resources_question_snapshot_from_type =#resourcesQuestionSnapshotFromType#
@} @}
@if(!isEmpty(resourcesQuestionSnapshotId)){ @if(!isEmpty(resourcesQuestionSnapshotId)){
and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId# and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId#

13
web/src/test/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotControllerTest.java
Unescape Escape View File

@ -3,7 +3,9 @@ package com.ibeetl.jlw.web;
import base.BaseTest; import base.BaseTest;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.ibeetl.admin.test.util.test.TestEnvUtil; import com.ibeetl.admin.test.util.test.TestEnvUtil;
import com.ibeetl.jlw.dao.StudentDao;
import com.ibeetl.jlw.dao.TeacherOpenCourseQuestionLogDao; import com.ibeetl.jlw.dao.TeacherOpenCourseQuestionLogDao;
import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog;
import org.junit.Assert; import org.junit.Assert;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -34,13 +36,17 @@ class ResourcesQuestionSnapshotControllerTest extends BaseTest {
@Resource @Resource
TeacherOpenCourseQuestionLogDao teacherOpenCourseQuestionLogDao; TeacherOpenCourseQuestionLogDao teacherOpenCourseQuestionLogDao;
@Resource
StudentDao studentDao;
@Test @Test
void getScoreInfo() throws Exception { void getScoreInfo() throws Exception {
try { try {
TeacherOpenCourseQuestionLog entity = new TeacherOpenCourseQuestionLog(); TeacherOpenCourseQuestionLog entity = new TeacherOpenCourseQuestionLog();
entity.setTeacherOpenCourseQuestionLogStatus(1); entity.setTeacherOpenCourseQuestionLogStatus(1);
List<TeacherOpenCourseQuestionLog> questionLogs = teacherOpenCourseQuestionLogDao.template(entity); List<TeacherOpenCourseQuestionLog> questionLogs = teacherOpenCourseQuestionLogDao.execute(
"select * from teacher_open_course_question_log " +
"where teacher_open_course_question_log_status = 1 order by RAND() limit 1");
// 断言 // 断言
Assert.assertTrue(ObjectUtil.isNotEmpty(questionLogs)); Assert.assertTrue(ObjectUtil.isNotEmpty(questionLogs));
@ -48,8 +54,9 @@ class ResourcesQuestionSnapshotControllerTest extends BaseTest {
TeacherOpenCourseQuestionLog questionLog = CollectionUtils.firstElement(questionLogs); TeacherOpenCourseQuestionLog questionLog = CollectionUtils.firstElement(questionLogs);
// 模拟登录学生身份 // 模拟登录学生身份
TestEnvUtil.setProperty("user.id", questionLog.getUserId().toString()); Student student = studentDao.single(questionLog.getStudentId());
TestEnvUtil.setProperty("user.orgId", questionLog.getOrgId().toString()); TestEnvUtil.setProperty("user.id", student.getUserId().toString());
TestEnvUtil.setProperty("user.orgId", student.getOrgId().toString());
// 随机取一个学生的登录信息 // 随机取一个学生的登录信息
putStudentLoginInfoToEnv(); putStudentLoginInfoToEnv();

6
web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogControllerTest.java
Unescape Escape View File

@ -6,7 +6,7 @@ import cn.hutool.core.util.RandomUtil;
import com.ibeetl.jlw.dao.ResourcesQuestionSnapshotDao; import com.ibeetl.jlw.dao.ResourcesQuestionSnapshotDao;
import com.ibeetl.jlw.dao.StudentDao; import com.ibeetl.jlw.dao.StudentDao;
import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot; import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionFromTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.RequestBuilder; import org.springframework.test.web.servlet.RequestBuilder;
@ -81,8 +81,8 @@ class TeacherOpenCourseQuestionLogControllerTest extends BaseTest {
putStudentLoginInfoToEnv(); putStudentLoginInfoToEnv();
// 随机来源类型 // 随机来源类型
TeacherOpenCourseQuestionFromTypeEnum fromTypeEnum = CollectionUtils ResourcesQuestionSnapshotFromTypeEnum fromTypeEnum = CollectionUtils
.firstElement(randomSet(TeacherOpenCourseQuestionFromTypeEnum.class)); .firstElement(randomSet(ResourcesQuestionSnapshotFromTypeEnum.class));
//构造请求参数 //构造请求参数
RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/addQuestionLog.json") RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/addQuestionLog.json")

Write Preview
Loading…
Cancel
Save