diff --git a/data_base_design/天泽数据大平台.pdb b/data_base_design/天泽数据大平台.pdb index c6bcf2be..d6e09559 100644 --- a/data_base_design/天泽数据大平台.pdb +++ b/data_base_design/天泽数据大平台.pdb @@ -1,5 +1,5 @@ - + @@ -4256,8 +4256,8 @@ Shadow=0 1661955336 1665583780 -((256786,18784), (283349,23359)) -((256786,18784),(256786,23059),(283349,23059)) +((256786,18784), (282577,22948)) +((256786,18784),(256786,22648),(282577,22648)) 1 8 16744576 @@ -4298,8 +4298,8 @@ Shadow=0 1661960819 1665721097 -((306535,27557), (308088,41939)) -((308088,41939),(308088,34338),(306835,34338),(306835,27557)) +((307225,27523), (308081,41925)) +((308081,41925),(308081,34338),(307525,34338),(307525,27523)) 1 8 16744576 @@ -4360,8 +4360,8 @@ Shadow=0 1662020600 1665583741 -((299321,8474), (327394,24009)) -((327394,8474),(327394,23709),(299321,23709)) +((299543,8474), (327394,23653)) +((327394,8474),(327394,23353),(299543,23353)) 1 8 16744576 @@ -4381,8 +4381,8 @@ Shadow=0 1662046228 1665583791 -((307176,17357), (307776,27594)) -((307476,17357),(307476,27594)) +((307541,17357), (308141,27563)) +((307841,17357),(307841,27563)) 1 8 16744576 @@ -4402,8 +4402,8 @@ Shadow=0 1662047541 1669389792 -((250179,30679), (296891,31279)) -((250179,31234),(278057,31234),(278057,30979),(296891,30979)) +((250179,30932), (296962,31532)) +((250179,31234),(278057,31234),(278057,31232),(296962,31232)) 1 8 16744576 @@ -4423,8 +4423,8 @@ Shadow=0 1662048005 1662048061 -((230014,25645), (295754,28276)) -((230014,28276),(230014,25945),(295754,25945)) +((230014,25476), (295754,28276)) +((230014,28276),(230014,25776),(295754,25776)) 1 8 16744576 @@ -4444,8 +4444,8 @@ Shadow=0 1662647833 1665821828 -((276450,14759), (285780,27627)) -((276450,14759),(276450,20457),(285480,20457),(285480,27627)) +((276450,14759), (285141,27599)) +((276450,14759),(276450,20457),(284841,20457),(284841,27599)) 1 8 16744576 @@ -4483,8 +4483,8 @@ Shadow=0 1662810688 1665583748 -((296364,29311), (338850,29911)) -((338850,29545),(319044,29545),(319044,29611),(296364,29611)) +((296402,29450), (338850,30050)) +((338850,29545),(319044,29545),(319044,29750),(296402,29750)) 1 8 16744576 @@ -4504,8 +4504,8 @@ Shadow=0 1662865795 1665583789 -((291944,17344), (294094,23652)) -((291944,17344),(291944,20313),(293794,20313),(293794,23652)) +((291944,17344), (293972,23291)) +((291944,17344),(291944,20313),(293672,20313),(293672,23291)) 1 8 16744576 @@ -4525,8 +4525,8 @@ Shadow=0 1664451291 1664451291 -((241793,17863), (285705,26950)) -((241793,17863),(241793,26650),(285705,26650)) +((242131,17940), (285080,26840)) +((242131,17940),(242131,26540),(285080,26540)) 1 8 16744576 @@ -4545,8 +4545,8 @@ Shadow=0 1664451372 1664451372 -((206554,6793), (234167,18440)) -((206554,6793),(206554,18140),(234167,18140)) +((206635,6900), (234040,18540)) +((206635,6900),(206635,18240),(234040,18240)) 1 8 16744576 @@ -4565,8 +4565,8 @@ Shadow=0 1664453932 1664453932 -((234482,-16351), (248094,15764)) -((248094,-16351),(234782,-16351),(234782,15764)) +((234393,-16131), (248070,15668)) +((248070,-16131),(234693,-16131),(234693,15668)) 1 8 16744576 @@ -4585,8 +4585,8 @@ Shadow=0 1664461421 1665583791 -((309993,-15970), (310730,7879)) -((310730,-15970),(310730,560),(310293,560),(310293,7879)) +((309993,-15930), (310593,7879)) +((310222,-15930),(310222,560),(310293,560),(310293,7879)) 1 8 16744576 @@ -4626,8 +4626,8 @@ Shadow=0 1664952224 1669988284 -((269308,32708), (287397,45668)) -((269308,45668),(287097,45668),(287097,32708)) +((269308,33106), (286858,45668)) +((269308,45668),(286558,45668),(286558,33106)) 1 8 16744576 @@ -4647,8 +4647,8 @@ Shadow=0 1666620846 1666620846 -((204737,-10592), (205337,542)) -((205037,-10592),(205037,542)) +((204773,-10560), (205373,120)) +((205073,-10560),(205073,120)) 1 8 16744576 @@ -4688,7 +4688,7 @@ Shadow=0 1623769194 1669987509 -1 -((-8695,51363), (5699,66285)) +((-9119,50726), (6123,66922)) 12615680 16570034 12632256 @@ -4713,7 +4713,7 @@ LABL 0 新宋体,8,N 1623769937 1662650462 -1 -((-8567,11553), (5827,25651)) +((-8991,10954), (6251,26250)) 12615680 16570034 12632256 @@ -4765,7 +4765,7 @@ LABL 0 新宋体,8,N 1623770338 1662650462 -1 -((-8519,-13745), (5875,-473)) +((-8943,-14307), (6299,89)) 12615680 16570034 12632256 @@ -4844,7 +4844,7 @@ LABL 0 新宋体,8,N 1623826338 1669987509 -1 -((42101,49703), (67309,57201)) +((41316,49404), (68094,57500)) 12615680 16570034 12632256 @@ -4869,7 +4869,7 @@ LABL 0 新宋体,8,N 1623828456 1661907266 -1 -((9860,2297), (33524,17219)) +((9127,1660), (34257,17856)) 12615680 16570034 12632256 @@ -4894,7 +4894,7 @@ LABL 0 新宋体,8,N 1623828633 1661907266 -1 -((11925,-9983), (30567,-835)) +((11359,-10357), (31133,-461)) 12615680 16570034 12632256 @@ -4919,7 +4919,7 @@ LABL 0 新宋体,8,N 1623828682 1661907266 -1 -((11692,-23952), (30334,-14804)) +((11126,-24326), (30900,-14430)) 12615680 16570034 12632256 @@ -4944,7 +4944,7 @@ LABL 0 新宋体,8,N 1623828725 1668414750 -1 -((9478,-37544), (33142,-27572)) +((8745,-37956), (33875,-27160)) 12615680 16570034 12632256 @@ -4969,7 +4969,7 @@ LABL 0 新宋体,8,N 1623828770 1666098792 -1 -((15482,19145), (32966,34893)) +((14955,18471), (33493,35567)) 12615680 16570034 12632256 @@ -4994,7 +4994,7 @@ LABL 0 新宋体,8,N 1623840859 1669343782 -1 -((38474,-23522), (54026,-10250)) +((38011,-24084), (54489,-9688)) 12615680 16570034 12632256 @@ -5019,7 +5019,7 @@ LABL 0 新宋体,8,N 1623841366 1669343782 -1 -((38351,-38151), (53903,-24879)) +((37888,-38713), (54366,-24317)) 12615680 16570034 12632256 @@ -5044,7 +5044,7 @@ LABL 0 新宋体,8,N 1623842834 1669700933 -1 -((73515,34605), (94861,71803)) +((72859,32956), (95517,73452)) 12615680 16570034 12632256 @@ -5069,7 +5069,7 @@ LABL 0 新宋体,8,N 1623845173 1669700933 -1 -((97714,50128), (123308,65876)) +((96916,49454), (124106,66550)) 12615680 16570034 12632256 @@ -5094,7 +5094,7 @@ LABL 0 新宋体,8,N 1623845296 1669700933 -1 -((97012,38528), (114110,47676)) +((96498,38154), (114624,48050)) 12615680 16570034 12632256 @@ -5119,7 +5119,7 @@ LABL 0 新宋体,8,N 1623859429 1669700933 -1 -((126351,49974), (150015,66546)) +((125618,49262), (150748,67258)) 12615680 16570034 12632256 @@ -5144,7 +5144,7 @@ LABL 0 新宋体,8,N 1623859834 1669700933 -1 -((126448,37699), (145090,47671)) +((125882,37287), (145656,48083)) 12615680 16570034 12632256 @@ -5196,7 +5196,7 @@ LABL 0 新宋体,8,N 1623860248 1669700933 -1 -((76512,-37814), (95540,-22066)) +((75933,-38488), (96119,-21392)) 12615680 16570034 12632256 @@ -5221,7 +5221,7 @@ LABL 0 新宋体,8,N 1623860509 1669700933 -1 -((97418,-37601), (112584,-22679)) +((96968,-38238), (113034,-22042)) 12615680 16570034 12632256 @@ -5246,7 +5246,7 @@ LABL 0 新宋体,8,N 1623861067 1669700933 -1 -((114819,9099), (138483,25671)) +((114086,8387), (139216,26383)) 12615680 16570034 12632256 @@ -5271,7 +5271,7 @@ LABL 0 新宋体,8,N 1623861149 1669700933 -1 -((117630,-4251), (136272,5721)) +((117064,-4663), (136838,6133)) 12615680 16570034 12632256 @@ -5296,7 +5296,7 @@ LABL 0 新宋体,8,N 1623861203 1669700933 -1 -((141097,-4531), (155105,7917)) +((140686,-5055), (155516,8441)) 12615680 16570034 12632256 @@ -5321,7 +5321,7 @@ LABL 0 新宋体,8,N 1623861290 1669700933 -1 -((117330,-17151), (135972,-7179)) +((116764,-17563), (136538,-6767)) 12615680 16570034 12632256 @@ -5373,7 +5373,7 @@ LABL 0 新宋体,8,N 1623862594 1666098792 -1 -((57999,-26039), (69689,-15241)) +((57665,-26488), (70023,-14792)) 12615680 16570034 12632256 @@ -5398,7 +5398,7 @@ LABL 0 新宋体,8,N 1623862978 1662650462 -1 -((-35612,-12014), (-10790,434)) +((-36384,-12538), (-10018,958)) 12615680 16570034 12632256 @@ -5423,7 +5423,7 @@ LABL 0 新宋体,8,N 1623863676 1662650462 -1 -((-42967,-23001), (-31277,-14679)) +((-43301,-23338), (-30943,-14342)) 12615680 16570034 12632256 @@ -5448,7 +5448,7 @@ LABL 0 新宋体,8,N 1623864141 1662650462 -1 -((-28700,-23001), (-10830,-14679)) +((-29240,-23338), (-10290,-14342)) 12615680 16570034 12632256 @@ -5473,7 +5473,7 @@ LABL 0 新宋体,8,N 1623895431 1666098792 -1 -((-56781,-22851), (-45091,-14529)) +((-57115,-23188), (-44757,-14192)) 12615680 16570034 12632256 @@ -5498,7 +5498,7 @@ LABL 0 新宋体,8,N 1625926250 1668414750 -1 -((43567,29349), (65685,45921)) +((42885,28637), (66367,46633)) 12615680 16570034 12632256 @@ -5523,7 +5523,7 @@ LABL 0 新宋体,8,N 1627129933 1669987509 -1 -((98192,67576), (113358,74248)) +((97742,67314), (113808,74510)) 12615680 16570034 12632256 @@ -5548,7 +5548,7 @@ LABL 0 新宋体,8,N 1628307450 1668414750 -1 -((-42268,-32406), (-32124,-25734)) +((-42551,-32668), (-31841,-25472)) 12615680 16570034 12632256 @@ -5573,7 +5573,7 @@ LABL 0 新宋体,8,N 1628307767 1668414750 -1 -((-29099,-35369), (-10843,-24571)) +((-29652,-35818), (-10290,-24122)) 12615680 16570034 12632256 @@ -5598,7 +5598,7 @@ LABL 0 新宋体,8,N 1628340137 1666098792 -1 -((38226,20835), (49324,25857)) +((37876,20648), (49674,26044)) 12615680 16570034 12632256 @@ -5623,7 +5623,7 @@ LABL 0 新宋体,8,N 1631242896 1668414750 -1 -((-7135,-34940), (3783,-26618)) +((-7443,-35277), (4091,-26281)) 12615680 16570034 12632256 @@ -5648,7 +5648,7 @@ LABL 0 新宋体,8,N 1631243538 1662650462 -1 -((-7060,-23278), (3858,-15780)) +((-7368,-23577), (4166,-15481)) 12615680 16570034 12632256 @@ -5673,7 +5673,7 @@ LABL 0 新宋体,8,N 1661850632 1669700933 -1 -((296563,50207), (319841,63479)) +((295843,49645), (320561,64041)) 12615680 16570034 12632256 @@ -5725,7 +5725,7 @@ LABL 0 新宋体,8,N 1661949359 1669700933 -1 -((283343,22147), (308165,33769)) +((282571,21660), (308937,34256)) 12615680 16570034 12632256 @@ -5885,7 +5885,7 @@ LABL 0 新宋体,8,N 1661960474 1668414750 -1 -((289997,35470), (326407,48742)) +((288839,34908), (327565,49304)) 12615680 16570034 12632256 @@ -6315,7 +6315,7 @@ LABL 0 新宋体,8,N 1664366421 1669700933 -1 -((226736,11944), (245764,21917)) +((226157,11532), (246343,22329)) 12615680 16570034 12632256 @@ -6340,7 +6340,7 @@ LABL 0 新宋体,8,N 1664367261 1669700933 -1 -((241300,-25979), (255694,-11882)) +((240876,-26579), (256118,-11282)) 12615680 16570034 12632256 @@ -6365,7 +6365,7 @@ LABL 0 新宋体,8,N 1664368015 1669700933 -1 -((195894,-1109), (214536,12164)) +((195328,-1671), (215102,12726)) 12615680 16570034 12632256 @@ -6390,7 +6390,7 @@ LABL 0 新宋体,8,N 1664460832 1669700933 -1 -((307694,-30483), (330198,-2360)) +((306999,-31720), (330893,-1123)) 12615680 16570034 12632256 @@ -6442,7 +6442,7 @@ LABL 0 新宋体,8,N 1666620383 1669700933 -1 -((196964,-16379), (210198,-5582)) +((196578,-16829), (210584,-5132)) 12615680 16570034 12632256 @@ -6467,7 +6467,7 @@ LABL 0 新宋体,8,N 1666665914 1669377987 -1 -((416389,31906), (440053,47654)) +((415656,31232), (440786,48328)) 12615680 16570034 12632256 @@ -6492,7 +6492,7 @@ LABL 0 新宋体,8,N 1666667664 1669377987 -1 -((416023,12840), (438141,30238)) +((415341,12091), (438823,30987)) 12615680 16570034 12632256 @@ -6571,7 +6571,7 @@ LABL 0 新宋体,8,N 1667489810 1669377987 -1 -((415699,-322), (439363,10476)) +((414966,-771), (440096,10925)) 12615680 16570034 12632256 @@ -6596,7 +6596,7 @@ LABL 0 新宋体,8,N 1667535250 1668414750 -1 -((57784,-40851), (71404,-27579)) +((57385,-41413), (71803,-27017)) 12615680 16570034 12632256 @@ -6621,7 +6621,7 @@ LABL 0 新宋体,8,N 1668411425 1669700933 -1 -((170865,-10239), (184963,-266)) +((170415,-10651), (185413,146)) 12615680 16570034 12632256 @@ -6646,7 +6646,7 @@ LABL 0 新宋体,8,N 1669343797 1669700933 -1 -((72210,-15914), (97032,1484)) +((71438,-16663), (97804,2233)) 12615680 16570034 12632256 @@ -6725,7 +6725,7 @@ LABL 0 新宋体,8,N 1669344473 1669700933 -1 -((231458,66429), (255122,83001)) +((230725,65717), (255855,83713)) 12615680 16570034 12632256 @@ -6748,9 +6748,9 @@ LABL 0 新宋体,8,N 1669986324 -1670172135 +1670172137 -1 -((255845,64095), (280211,84151)) +((255995,64770), (280361,84826)) 0 1 12615680 @@ -20965,10 +20965,11 @@ COLLATE = utf8_general_ci question_setting_type 1664182126 lx -1669987509 -lx +1670217067 +87966 类型 枚举（ResourcesQuestionSnapshotFromTypeEnum） -bigint +varchar(50) +50 79047956-FCCE-482C-A7FC-8EF8D94E329C diff --git a/data_base_design/天泽数据大平台.pdm b/data_base_design/天泽数据大平台.pdm index 912f8f07..668e37b3 100644 --- a/data_base_design/天泽数据大平台.pdm +++ b/data_base_design/天泽数据大平台.pdm @@ -1,5 +1,5 @@ - + @@ -4256,8 +4256,8 @@ Shadow=0 1661955336 1665583780 -((256786,18784), (283349,23359)) -((256786,18784),(256786,23059),(283349,23059)) +((256786,18784), (282577,22948)) +((256786,18784),(256786,22648),(282577,22648)) 1 8 16744576 @@ -4298,8 +4298,8 @@ Shadow=0 1661960819 1665721097 -((306535,27557), (308088,41939)) -((308088,41939),(308088,34338),(306835,34338),(306835,27557)) +((307225,27523), (308081,41925)) +((308081,41925),(308081,34338),(307525,34338),(307525,27523)) 1 8 16744576 @@ -4360,8 +4360,8 @@ Shadow=0 1662020600 1665583741 -((299321,8474), (327394,24009)) -((327394,8474),(327394,23709),(299321,23709)) +((299543,8474), (327394,23653)) +((327394,8474),(327394,23353),(299543,23353)) 1 8 16744576 @@ -4381,8 +4381,8 @@ Shadow=0 1662046228 1665583791 -((307176,17357), (307776,27594)) -((307476,17357),(307476,27594)) +((307541,17357), (308141,27563)) +((307841,17357),(307841,27563)) 1 8 16744576 @@ -4402,8 +4402,8 @@ Shadow=0 1662047541 1669389792 -((250179,30679), (296891,31279)) -((250179,31234),(278057,31234),(278057,30979),(296891,30979)) +((250179,30932), (296962,31532)) +((250179,31234),(278057,31234),(278057,31232),(296962,31232)) 1 8 16744576 @@ -4423,8 +4423,8 @@ Shadow=0 1662048005 1662048061 -((230014,25645), (295754,28276)) -((230014,28276),(230014,25945),(295754,25945)) +((230014,25476), (295754,28276)) +((230014,28276),(230014,25776),(295754,25776)) 1 8 16744576 @@ -4444,8 +4444,8 @@ Shadow=0 1662647833 1665821828 -((276450,14759), (285780,27627)) -((276450,14759),(276450,20457),(285480,20457),(285480,27627)) +((276450,14759), (285141,27599)) +((276450,14759),(276450,20457),(284841,20457),(284841,27599)) 1 8 16744576 @@ -4483,8 +4483,8 @@ Shadow=0 1662810688 1665583748 -((296364,29311), (338850,29911)) -((338850,29545),(319044,29545),(319044,29611),(296364,29611)) +((296402,29450), (338850,30050)) +((338850,29545),(319044,29545),(319044,29750),(296402,29750)) 1 8 16744576 @@ -4504,8 +4504,8 @@ Shadow=0 1662865795 1665583789 -((291944,17344), (294094,23652)) -((291944,17344),(291944,20313),(293794,20313),(293794,23652)) +((291944,17344), (293972,23291)) +((291944,17344),(291944,20313),(293672,20313),(293672,23291)) 1 8 16744576 @@ -4525,8 +4525,8 @@ Shadow=0 1664451291 1664451291 -((241793,17863), (285705,26950)) -((241793,17863),(241793,26650),(285705,26650)) +((242131,17940), (285080,26840)) +((242131,17940),(242131,26540),(285080,26540)) 1 8 16744576 @@ -4545,8 +4545,8 @@ Shadow=0 1664451372 1664451372 -((206554,6793), (234167,18440)) -((206554,6793),(206554,18140),(234167,18140)) +((206635,6900), (234040,18540)) +((206635,6900),(206635,18240),(234040,18240)) 1 8 16744576 @@ -4565,8 +4565,8 @@ Shadow=0 1664453932 1664453932 -((234482,-16351), (248094,15764)) -((248094,-16351),(234782,-16351),(234782,15764)) +((234393,-16131), (248070,15668)) +((248070,-16131),(234693,-16131),(234693,15668)) 1 8 16744576 @@ -4585,8 +4585,8 @@ Shadow=0 1664461421 1665583791 -((309993,-15970), (310730,7879)) -((310730,-15970),(310730,560),(310293,560),(310293,7879)) +((309993,-15930), (310593,7879)) +((310222,-15930),(310222,560),(310293,560),(310293,7879)) 1 8 16744576 @@ -4626,8 +4626,8 @@ Shadow=0 1664952224 1669988284 -((269308,32708), (287397,45668)) -((269308,45668),(287097,45668),(287097,32708)) +((269308,33106), (286858,45668)) +((269308,45668),(286558,45668),(286558,33106)) 1 8 16744576 @@ -4647,8 +4647,8 @@ Shadow=0 1666620846 1666620846 -((204737,-10592), (205337,542)) -((205037,-10592),(205037,542)) +((204773,-10560), (205373,120)) +((205073,-10560),(205073,120)) 1 8 16744576 @@ -4688,7 +4688,7 @@ Shadow=0 1623769194 1669987509 -1 -((-8695,51363), (5699,66285)) +((-9119,50726), (6123,66922)) 12615680 16570034 12632256 @@ -4713,7 +4713,7 @@ LABL 0 新宋体,8,N 1623769937 1662650462 -1 -((-8567,11553), (5827,25651)) +((-8991,10954), (6251,26250)) 12615680 16570034 12632256 @@ -4765,7 +4765,7 @@ LABL 0 新宋体,8,N 1623770338 1662650462 -1 -((-8519,-13745), (5875,-473)) +((-8943,-14307), (6299,89)) 12615680 16570034 12632256 @@ -4844,7 +4844,7 @@ LABL 0 新宋体,8,N 1623826338 1669987509 -1 -((42101,49703), (67309,57201)) +((41316,49404), (68094,57500)) 12615680 16570034 12632256 @@ -4869,7 +4869,7 @@ LABL 0 新宋体,8,N 1623828456 1661907266 -1 -((9860,2297), (33524,17219)) +((9127,1660), (34257,17856)) 12615680 16570034 12632256 @@ -4894,7 +4894,7 @@ LABL 0 新宋体,8,N 1623828633 1661907266 -1 -((11925,-9983), (30567,-835)) +((11359,-10357), (31133,-461)) 12615680 16570034 12632256 @@ -4919,7 +4919,7 @@ LABL 0 新宋体,8,N 1623828682 1661907266 -1 -((11692,-23952), (30334,-14804)) +((11126,-24326), (30900,-14430)) 12615680 16570034 12632256 @@ -4944,7 +4944,7 @@ LABL 0 新宋体,8,N 1623828725 1668414750 -1 -((9478,-37544), (33142,-27572)) +((8745,-37956), (33875,-27160)) 12615680 16570034 12632256 @@ -4969,7 +4969,7 @@ LABL 0 新宋体,8,N 1623828770 1666098792 -1 -((15482,19145), (32966,34893)) +((14955,18471), (33493,35567)) 12615680 16570034 12632256 @@ -4994,7 +4994,7 @@ LABL 0 新宋体,8,N 1623840859 1669343782 -1 -((38474,-23522), (54026,-10250)) +((38011,-24084), (54489,-9688)) 12615680 16570034 12632256 @@ -5019,7 +5019,7 @@ LABL 0 新宋体,8,N 1623841366 1669343782 -1 -((38351,-38151), (53903,-24879)) +((37888,-38713), (54366,-24317)) 12615680 16570034 12632256 @@ -5044,7 +5044,7 @@ LABL 0 新宋体,8,N 1623842834 1669700933 -1 -((73515,34605), (94861,71803)) +((72859,32956), (95517,73452)) 12615680 16570034 12632256 @@ -5069,7 +5069,7 @@ LABL 0 新宋体,8,N 1623845173 1669700933 -1 -((97714,50128), (123308,65876)) +((96916,49454), (124106,66550)) 12615680 16570034 12632256 @@ -5094,7 +5094,7 @@ LABL 0 新宋体,8,N 1623845296 1669700933 -1 -((97012,38528), (114110,47676)) +((96498,38154), (114624,48050)) 12615680 16570034 12632256 @@ -5119,7 +5119,7 @@ LABL 0 新宋体,8,N 1623859429 1669700933 -1 -((126351,49974), (150015,66546)) +((125618,49262), (150748,67258)) 12615680 16570034 12632256 @@ -5144,7 +5144,7 @@ LABL 0 新宋体,8,N 1623859834 1669700933 -1 -((126448,37699), (145090,47671)) +((125882,37287), (145656,48083)) 12615680 16570034 12632256 @@ -5196,7 +5196,7 @@ LABL 0 新宋体,8,N 1623860248 1669700933 -1 -((76512,-37814), (95540,-22066)) +((75933,-38488), (96119,-21392)) 12615680 16570034 12632256 @@ -5221,7 +5221,7 @@ LABL 0 新宋体,8,N 1623860509 1669700933 -1 -((97418,-37601), (112584,-22679)) +((96968,-38238), (113034,-22042)) 12615680 16570034 12632256 @@ -5246,7 +5246,7 @@ LABL 0 新宋体,8,N 1623861067 1669700933 -1 -((114819,9099), (138483,25671)) +((114086,8387), (139216,26383)) 12615680 16570034 12632256 @@ -5271,7 +5271,7 @@ LABL 0 新宋体,8,N 1623861149 1669700933 -1 -((117630,-4251), (136272,5721)) +((117064,-4663), (136838,6133)) 12615680 16570034 12632256 @@ -5296,7 +5296,7 @@ LABL 0 新宋体,8,N 1623861203 1669700933 -1 -((141097,-4531), (155105,7917)) +((140686,-5055), (155516,8441)) 12615680 16570034 12632256 @@ -5321,7 +5321,7 @@ LABL 0 新宋体,8,N 1623861290 1669700933 -1 -((117330,-17151), (135972,-7179)) +((116764,-17563), (136538,-6767)) 12615680 16570034 12632256 @@ -5373,7 +5373,7 @@ LABL 0 新宋体,8,N 1623862594 1666098792 -1 -((57999,-26039), (69689,-15241)) +((57665,-26488), (70023,-14792)) 12615680 16570034 12632256 @@ -5398,7 +5398,7 @@ LABL 0 新宋体,8,N 1623862978 1662650462 -1 -((-35612,-12014), (-10790,434)) +((-36384,-12538), (-10018,958)) 12615680 16570034 12632256 @@ -5423,7 +5423,7 @@ LABL 0 新宋体,8,N 1623863676 1662650462 -1 -((-42967,-23001), (-31277,-14679)) +((-43301,-23338), (-30943,-14342)) 12615680 16570034 12632256 @@ -5448,7 +5448,7 @@ LABL 0 新宋体,8,N 1623864141 1662650462 -1 -((-28700,-23001), (-10830,-14679)) +((-29240,-23338), (-10290,-14342)) 12615680 16570034 12632256 @@ -5473,7 +5473,7 @@ LABL 0 新宋体,8,N 1623895431 1666098792 -1 -((-56781,-22851), (-45091,-14529)) +((-57115,-23188), (-44757,-14192)) 12615680 16570034 12632256 @@ -5498,7 +5498,7 @@ LABL 0 新宋体,8,N 1625926250 1668414750 -1 -((43567,29349), (65685,45921)) +((42885,28637), (66367,46633)) 12615680 16570034 12632256 @@ -5523,7 +5523,7 @@ LABL 0 新宋体,8,N 1627129933 1669987509 -1 -((98192,67576), (113358,74248)) +((97742,67314), (113808,74510)) 12615680 16570034 12632256 @@ -5548,7 +5548,7 @@ LABL 0 新宋体,8,N 1628307450 1668414750 -1 -((-42268,-32406), (-32124,-25734)) +((-42551,-32668), (-31841,-25472)) 12615680 16570034 12632256 @@ -5573,7 +5573,7 @@ LABL 0 新宋体,8,N 1628307767 1668414750 -1 -((-29099,-35369), (-10843,-24571)) +((-29652,-35818), (-10290,-24122)) 12615680 16570034 12632256 @@ -5598,7 +5598,7 @@ LABL 0 新宋体,8,N 1628340137 1666098792 -1 -((38226,20835), (49324,25857)) +((37876,20648), (49674,26044)) 12615680 16570034 12632256 @@ -5623,7 +5623,7 @@ LABL 0 新宋体,8,N 1631242896 1668414750 -1 -((-7135,-34940), (3783,-26618)) +((-7443,-35277), (4091,-26281)) 12615680 16570034 12632256 @@ -5648,7 +5648,7 @@ LABL 0 新宋体,8,N 1631243538 1662650462 -1 -((-7060,-23278), (3858,-15780)) +((-7368,-23577), (4166,-15481)) 12615680 16570034 12632256 @@ -5673,7 +5673,7 @@ LABL 0 新宋体,8,N 1661850632 1669700933 -1 -((296563,50207), (319841,63479)) +((295843,49645), (320561,64041)) 12615680 16570034 12632256 @@ -5725,7 +5725,7 @@ LABL 0 新宋体,8,N 1661949359 1669700933 -1 -((283343,22147), (308165,33769)) +((282571,21660), (308937,34256)) 12615680 16570034 12632256 @@ -5885,7 +5885,7 @@ LABL 0 新宋体,8,N 1661960474 1668414750 -1 -((289997,35470), (326407,48742)) +((288839,34908), (327565,49304)) 12615680 16570034 12632256 @@ -6315,7 +6315,7 @@ LABL 0 新宋体,8,N 1664366421 1669700933 -1 -((226736,11944), (245764,21917)) +((226157,11532), (246343,22329)) 12615680 16570034 12632256 @@ -6340,7 +6340,7 @@ LABL 0 新宋体,8,N 1664367261 1669700933 -1 -((241300,-25979), (255694,-11882)) +((240876,-26579), (256118,-11282)) 12615680 16570034 12632256 @@ -6365,7 +6365,7 @@ LABL 0 新宋体,8,N 1664368015 1669700933 -1 -((195894,-1109), (214536,12164)) +((195328,-1671), (215102,12726)) 12615680 16570034 12632256 @@ -6390,7 +6390,7 @@ LABL 0 新宋体,8,N 1664460832 1669700933 -1 -((307694,-30483), (330198,-2360)) +((306999,-31720), (330893,-1123)) 12615680 16570034 12632256 @@ -6442,7 +6442,7 @@ LABL 0 新宋体,8,N 1666620383 1669700933 -1 -((196964,-16379), (210198,-5582)) +((196578,-16829), (210584,-5132)) 12615680 16570034 12632256 @@ -6467,7 +6467,7 @@ LABL 0 新宋体,8,N 1666665914 1669377987 -1 -((416389,31906), (440053,47654)) +((415656,31232), (440786,48328)) 12615680 16570034 12632256 @@ -6492,7 +6492,7 @@ LABL 0 新宋体,8,N 1666667664 1669377987 -1 -((416023,12840), (438141,30238)) +((415341,12091), (438823,30987)) 12615680 16570034 12632256 @@ -6571,7 +6571,7 @@ LABL 0 新宋体,8,N 1667489810 1669377987 -1 -((415699,-322), (439363,10476)) +((414966,-771), (440096,10925)) 12615680 16570034 12632256 @@ -6596,7 +6596,7 @@ LABL 0 新宋体,8,N 1667535250 1668414750 -1 -((57784,-40851), (71404,-27579)) +((57385,-41413), (71803,-27017)) 12615680 16570034 12632256 @@ -6621,7 +6621,7 @@ LABL 0 新宋体,8,N 1668411425 1669700933 -1 -((170865,-10239), (184963,-266)) +((170415,-10651), (185413,146)) 12615680 16570034 12632256 @@ -6646,7 +6646,7 @@ LABL 0 新宋体,8,N 1669343797 1669700933 -1 -((72210,-15914), (97032,1484)) +((71438,-16663), (97804,2233)) 12615680 16570034 12632256 @@ -6725,7 +6725,7 @@ LABL 0 新宋体,8,N 1669344473 1669700933 -1 -((231458,66429), (255122,83001)) +((230725,65717), (255855,83713)) 12615680 16570034 12632256 @@ -20915,8 +20915,8 @@ COLLATE = utf8_general_ci question_log_summary 1661850632 lx -1670172100 -lx +1670218115 +87966 学生-题目日志-分析汇总 auto_increment = 1 ENGINE = InnoDB @@ -20965,10 +20965,11 @@ COLLATE = utf8_general_ci question_setting_type 1664182126 lx -1669987509 -lx +1670217067 +87966 类型 枚举（ResourcesQuestionSnapshotFromTypeEnum） -bigint +varchar(50) +50 79047956-FCCE-482C-A7FC-8EF8D94E329C @@ -20994,6 +20995,17 @@ COLLATE = utf8_general_ci float +5B85EBEA-89F7-49A2-88B8-F53C9DDF2778 +question_log_summary_student_total_score +question_log_summary_student_total_score +1669987828 +87966 +1670218115 +87966 +学生总得分 +float + + B6F6BAB4-0EF0-4BE6-B661-74638716B0F8 person_id person_id @@ -21004,7 +21016,7 @@ COLLATE = utf8_general_ci 人员ID（学生ID等等） bigint - + 425F40EA-F79E-409A-8C41-34C006D6D589 question_log_ids question_log_ids @@ -21016,7 +21028,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + 2287A3B7-121E-41AE-87AC-FE935B55A80C question_log_summary_question_total_count question_log_summary_question_total_count @@ -21027,7 +21039,7 @@ COLLATE = utf8_general_ci 配置的题目总数 int - + 9859472C-69C7-4E9A-9316-7BF0939E6BF2 question_log_summary_student_do_count question_log_summary_student_do_count @@ -21038,7 +21050,7 @@ COLLATE = utf8_general_ci 学生做题总数 int - + B7EDC098-95AB-4219-9242-E644701913C4 question_log_summary_success_count question_log_summary_success_count @@ -21049,7 +21061,7 @@ COLLATE = utf8_general_ci 正确数量 int - + 109364AE-9C76-407B-934A-4307215E4982 question_log_summary_error_count question_log_summary_error_count @@ -21060,7 +21072,7 @@ COLLATE = utf8_general_ci 错误数量 int - + 4EEC3C67-2C8A-45F5-8540-A6FFFEA2968C question_log_summary_success_rate question_log_summary_success_rate @@ -21071,7 +21083,7 @@ COLLATE = utf8_general_ci 正确率,最大100 float - + 11D26CA6-CB55-43F0-9C8F-D1C07A6BC233 question_log_summary_current_pass_rate question_log_summary_current_pass_rate @@ -21082,7 +21094,7 @@ COLLATE = utf8_general_ci 当前配置的及格比率 float - + B7B56144-0CE8-4EA3-8315-C097AE2A2B4D question_log_summary_is_pass question_log_summary_is_pass @@ -21094,7 +21106,7 @@ COLLATE = utf8_general_ci int(2) 2 - + 45DBB89C-2AC0-4F71-AB87-1350950F054B finish_second_time finish_second_time @@ -21105,7 +21117,7 @@ COLLATE = utf8_general_ci 完成用时(秒) int - + 32BB73E0-CEAF-45BD-BC36-F699A354C8D7 finish_time finish_time @@ -21117,7 +21129,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 30F0DBA1-03FC-493E-B628-E3297D197E97 question_log_summary_status question_log_summary_status @@ -21129,7 +21141,7 @@ COLLATE = utf8_general_ci int(2) 2 - + 5BDCBCAE-7982-49D0-91A7-2C51706D400F question_log_summary_add_time question_log_summary_add_time @@ -21140,7 +21152,7 @@ COLLATE = utf8_general_ci 添加时间 datetime - + 37755E03-C150-47C6-98C6-1BB69E36CAC1 org_id org_id @@ -21151,7 +21163,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 9A38CEE4-E7F0-4393-8A46-7F0B8D2B44BD user_id user_id @@ -21164,7 +21176,7 @@ COLLATE = utf8_general_ci - + 203F6632-947A-4CFA-815D-E029ACCFD264 Key_1 Key_1 @@ -21178,12 +21190,12 @@ COLLATE = utf8_general_ci - + - + BFEA4109-96F9-4074-AF58-B84D6574A7FC PUBLIC PUBLIC @@ -21194,7 +21206,7 @@ COLLATE = utf8_general_ci - + ABEFC813-1056-4507-A9A7-809C149B4ABE 1661954753 lx @@ -21482,7 +21494,7 @@ COLLATE = utf8_general_ci - + 5963E417-B2CE-431D-988A-B3493AAE5EE4 MySQL 5.0 MYSQL50 diff --git a/doc/sql/mysql/tianze-pro-update.sql b/doc/sql/mysql/tianze-pro-update.sql index 9855654c..1714c16b 100644 --- a/doc/sql/mysql/tianze-pro-update.sql +++ b/doc/sql/mysql/tianze-pro-update.sql @@ -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 '配置的题目总数', @@ -485,8 +486,8 @@ create table question_log_summary primary key (question_log_summary_id) ) auto_increment = 1 - ENGINE = InnoDB - DEFAULT CHARACTER SET = utf8 - COLLATE = utf8_general_ci; +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8 +COLLATE = utf8_general_ci; alter table question_log_summary comment '学生-题目日志-分析汇总'; diff --git a/web/src/main/java/com/ibeetl/jlw/dao/GeneralResourcesQuestionSnapshotDao.java b/web/src/main/java/com/ibeetl/jlw/dao/GeneralResourcesQuestionSnapshotDao.java index b9a0189d..15926cab 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/GeneralResourcesQuestionSnapshotDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/GeneralResourcesQuestionSnapshotDao.java @@ -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 getQuestionTestSimpleInfo(PageQuery query); + + /** + * 功能描述:
+ * 题目配置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); + } } diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionSnapshotDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionSnapshotDao.java index b79eb02e..774eee03 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionSnapshotDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionSnapshotDao.java @@ -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 getValuesByQueryNotWithPermission(ResourcesQuestionSnapshotQuery resourcesQuestionSnapshotQuery); + + /** + * 功能描述:
+ * 题目配置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); + } } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLog.java b/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLog.java index dcc95eae..78f7e78e 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLog.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLog.java @@ -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()); } /** * 功能描述:
@@ -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()); } } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLogScoreInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLogScoreInfo.java index ba8e05c1..8d7002ea 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLogScoreInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLogScoreInfo.java @@ -35,6 +35,9 @@ public class GeneralQuestionLogScoreInfo extends BaseEntity { // 开课题目设置ID private Long generalQuestionSettingId; + // 学生ID + private Long studentId; + // 查询指定的题目分数 private QuestionLogAddTypeEnum questionLogAddType; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLogScoreInfo1.java b/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLogScoreInfo1.java new file mode 100644 index 00000000..7bef00c9 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLogScoreInfo1.java @@ -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 questionLogList; +} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/QuestionLogSummary.java b/web/src/main/java/com/ibeetl/jlw/entity/QuestionLogSummary.java index b450d743..53244420 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/QuestionLogSummary.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/QuestionLogSummary.java @@ -40,10 +40,13 @@ public class QuestionLogSummary extends BaseEntity{ private QuestionBusinessTypeEnum questionLogSummaryFromType ; + //学生总得分 + + private BigDecimal questionLogSummaryStudentTotalScore ; //配置的题目总分数 private BigDecimal questionSettingTotalScore ; - + //人员ID（学生ID等等） private Long personId ; @@ -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; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java index d9e7770a..06a2500e 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java @@ -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()); } /** * 功能描述:
@@ -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()); } } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogScoreInfo1.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogScoreInfo1.java new file mode 100644 index 00000000..217bbc99 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogScoreInfo1.java @@ -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 questionLogList; + +} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/vo/GeneralQuestionTestSimpleInfoVO.java b/web/src/main/java/com/ibeetl/jlw/entity/vo/GeneralQuestionTestSimpleInfoVO.java index 03233eee..8055c326 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/vo/GeneralQuestionTestSimpleInfoVO.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/vo/GeneralQuestionTestSimpleInfoVO.java @@ -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 - - private Float correctRate; + @Override + public void setQuestionLogSummaryId(Long questionLogSummaryId) { + super.setQuestionLogSummaryId(questionLogSummaryId); + this.setIsFinished(null != questionLogSummaryId); + } + +// // 我的分数 +// +// private String myScore; +// +// // 题目总数 +// +// private Integer questionTotalCount; +// +// // 完成用时 +// +// private String finishTime; +// +// // 完成用时（秒） +// +// private String finishSecondTime; +// +// // 正确率 最大100 +// +// private Float correctRate; } diff --git a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java index 307932aa..94762cee 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java @@ -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{ @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 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 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 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 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 getScoreInfoDo( + public JsonResult 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 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 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 getScoreInfo1( + Long questionSettingId, + @RequestParam(required = false, defaultValue = "FINALLY_SUBMIT") QuestionLogAddTypeEnum questionLogAddType, + @SCoreUser + CoreUser coreUser) { + return JsonResult.success(generalResourcesQuestionSnapshotService.getScoreInfo1(questionSettingId, questionLogAddType)); + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java index e1070b00..031882ee 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java @@ -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 getScoreInfoDo( + public JsonResult 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 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 getScoreInfo( + public JsonResult 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 getScoreInfo( + Long questionSettingId, + @RequestParam(required = false, defaultValue = "FINALLY_SUBMIT") QuestionLogAddTypeEnum questionLogAddType, + @SCoreUser + CoreUser coreUser) { + return JsonResult.success(resourcesQuestionSnapshotService.getScoreInfo1(questionSettingId, questionLogAddType)); + } /** * 教师端-获取题目的练习成绩 diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/QuestionLogSummaryQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/QuestionLogSummaryQuery.java index e78a8b98..752890cd 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/QuestionLogSummaryQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/QuestionLogSummaryQuery.java @@ -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; + } } diff --git a/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md b/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md index 6ab34c14..b6d143d6 100644 --- a/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md +++ b/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md @@ -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 === * 教师端-题目的练习详情 diff --git a/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md b/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md index 45eb3ff4..6b41f3e3 100644 --- a/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md +++ b/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md @@ -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 === * 教师端-题目的练习详情