From 149f9865b2bf1b0b529204c1989370cbc730d8ae Mon Sep 17 00:00:00 2001 From: jinxuesong Date: Sat, 20 Apr 2019 12:52:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/templates/schedule.ftl | 30 ++--- WebContent/jsp/QueryCurriculums.jsp | 68 ++++++++-- .../controller/CourseController.class | Bin 8731 -> 8752 bytes .../controller/CurriculumController.class | Bin 36431 -> 38320 bytes .../curriculum/service/CourseService.class | Bin 1341 -> 1547 bytes .../service/CourseServiceImpl.class | Bin 7458 -> 7680 bytes .../service/CurriculumServiceImpl.class | Bin 10473 -> 10503 bytes .../controller/CourseController.java | 2 +- .../controller/CurriculumController.java | 118 +++++++++++------- .../curriculum/service/CourseService.java | 4 +- .../curriculum/service/CourseServiceImpl.java | 41 +++--- .../service/CurriculumServiceImpl.java | 1 + 12 files changed, 174 insertions(+), 90 deletions(-) diff --git a/WebContent/WEB-INF/templates/schedule.ftl b/WebContent/WEB-INF/templates/schedule.ftl index cafcf17..e03ce84 100644 --- a/WebContent/WEB-INF/templates/schedule.ftl +++ b/WebContent/WEB-INF/templates/schedule.ftl @@ -8632,7 +8632,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} @@ -9001,7 +9001,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} @@ -9725,7 +9725,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} @@ -10094,7 +10094,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} @@ -10870,7 +10870,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} @@ -11241,7 +11241,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} @@ -11966,7 +11966,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} @@ -12335,7 +12335,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} @@ -14056,7 +14056,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} @@ -14425,7 +14425,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} @@ -15149,7 +15149,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} @@ -15518,7 +15518,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} @@ -16294,7 +16294,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} @@ -16665,7 +16665,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} @@ -17390,7 +17390,7 @@ -${course.hpw} +<#if course.unit==1>${course.hpw}周<#if course.unit?? && course.unit==0>${course.hpw} diff --git a/WebContent/jsp/QueryCurriculums.jsp b/WebContent/jsp/QueryCurriculums.jsp index d1681a6..ba45a4f 100644 --- a/WebContent/jsp/QueryCurriculums.jsp +++ b/WebContent/jsp/QueryCurriculums.jsp @@ -44,7 +44,38 @@ }) function init(){ - + $("#search").click(function(){ + $tbody = $('.dnd .left'); + + $.ajax({ + url : '<%=request.getContextPath()%>/CourseController/QueryCourseBy.action', + data : { name : $('#coursename').val() }, + datatype : 'json', + success : function(data){ + for(var i=0;i + ${course.id } + ${course.name} + + ---- + ${course.score} + 0 + ${course.theoretical} + ${course.experiement} + 0 + 1 + 17 + + + ${course.unit} + + */ + }); } var dragSrcEl = null; @@ -183,7 +214,7 @@ if(i < $dest_trs.length - 1){//前面的行 除了最后一行小计 //计算出总学时（理论学时+实验学时） - $dest_tds[4].innerHTML = parseInt($dest_tds[5].innerHTML) + parseInt($dest_tds[6].innerHTML); + ""; + $dest_tds[4].innerHTML = parseFloat($dest_tds[5].innerHTML) + parseFloat($dest_tds[6].innerHTML); + ""; } } @@ -208,9 +239,11 @@ for(var j = 0;j < $dest_trs_disperse.length; j++){//所有分散课 if($dest_trs_avaliable[i] == $dest_trs_disperse[j]){//开课，并分散进行 var $dest_disperse_tds = $($dest_trs_disperse[j]).children(); - total_disperse += parseInt($($dest_disperse_tds[4]).text()); - theoretical_disperse += parseInt($($dest_disperse_tds[5]).text()); - experiment_disperse += parseInt($($dest_disperse_tds[6]).text()); + if($($dest_disperse_tds[12]).text() == '0'){//单位是学时的累加 + total_disperse += parseFloat($($dest_disperse_tds[4]).text()); + theoretical_disperse += parseFloat($($dest_disperse_tds[5]).text()); + experiment_disperse += parseFloat($($dest_disperse_tds[6]).text()); + } if($($dest_disperse_tds[12]).text() == '1'){//如果单位为周 total_week_disperse += (parseFloat($($dest_disperse_tds[7]).text()));//总分散周数 @@ -230,18 +263,29 @@ } //所有开课，计算学分学时 $dest_tdss = $($dest_trs_avaliable[i]).children(); + for(var k = 0; k < $dest_tdss.length ; k ++ ){ + if(k == 3){//学分全累加 + total[k] += parseFloat($dest_tdss[k].innerHTML); + continue; + } + } //没有找到相同的，计算 if(!found_same){ for(var k = 0; k < $dest_tdss.length ; k ++ ){ - if(k >= 3 && k < 7){ - total[k] += parseInt($dest_tdss[k].innerHTML); + if(k > 3 && k < 7){ + if($($dest_tdss[12]).text() == '0'){//单位是学时的累加 + total[k] += parseFloat($dest_tdss[k].innerHTML); + } } } if($($dest_tdss[12]).text() == '1'){//如果单位为周 - total_week += (parseFloat($($dest_tdss[7]).text()));//总周数 + var str = $($dest_tdss[7]).text(); + str = str.replace("周",""); + + total_week += (parseFloat(str));//总周数 }else{ - total[7] += parseInt($dest_tdss[7].innerHTML) + total[7] += parseFloat($dest_tdss[7].innerHTML) } } @@ -308,6 +352,9 @@ if($($tds[12]).text() == '1'){//如果单位为周 $($tds[7]).text($($tds[4]).text() +"周"); + $($tds[4]).css('color','white'); + $($tds[5]).css('color','white'); + $($tds[6]).css('color','white'); } } @@ -465,8 +512,7 @@ ${course.id } ${course.name} - - ---- + ${course.identifier} ${course.score} 0 ${course.theoretical} diff --git a/build/classes/cn/edu/hrbcu/curriculum/controller/CourseController.class b/build/classes/cn/edu/hrbcu/curriculum/controller/CourseController.class index 243e858c87bb103fdf8f75edd6898636cc0dd893..07aa2d1855705d4a854d97fc152db77b1c2b9932 100644 GIT binary patch delta 223 zcmbR3vcY8otC+C5hNn+fVp*boPGVlVzE6H$y7gubv1MGG{tPS(Yzzzx9h0{!=yUr> zvg~9iV`P}e;57N8f~CQ5gVjz(J(kIeieB}F47(Ug7Zk%5eW(Fn(afU*MwG8VR zm>IMgVj0#mtOPnDm_dzU1H(q3`Yk|RJV5mjxt&0{T|g0e2Il`j>)6;C7}*)s*co~z Izfv>=0BdS5{Qv*} delta 202 zcmXAiv1-Bq7=*vy7(;3WK~PgjW0oQjT3kdFI|-$(UHT9K7s(>j!PPBe!BOa-O;vVIGvkD-E6>>$_jsyIKBOmogc1>3cI2oLvSy>NE#CR& ki#%`mB>X79*Ve7_S(a*cRL8@(=v~1=EP1e4#23GP1>jF7!2kdN diff --git a/build/classes/cn/edu/hrbcu/curriculum/controller/CurriculumController.class b/build/classes/cn/edu/hrbcu/curriculum/controller/CurriculumController.class index 9db0881e5082ea98a3dd72b74c476b3daf460022..ae080c3288936ccdc6165461335da81286c16026 100644 GIT binary patch literal 38320 zcmeHw37k~L@qbmn_vX#a&JN2S@E-Tg0t*X>$SjBm$RUSZf`Ed{>;R*CxrabBUcn<8 z4`S4acpt0ApI3BY#oK^r)Tr@}F&?NGlb;4}Q1}1scg@>-;V1gZ=dT}Ny8CrkS65e6 zS5?=0KK=az4-?TSC0!@MbV$53KT%Yjzq(>YygEN#T~U#YR~J{8FD)&rDy&MDl~yv1nORn`D!;P4B3Zg>Wkq30Voh1aiTNuM zg{77GD+}XQWfkl43%vpPhgVmXtw~lSiU2k}URGUEnedRyZyP!P06^$yLntXLNKdWWWMGz=$XH?SiUoz>JEqK;W%0t|g@qMKS$7)Ms?|v_ zVys0B+K?Z)p1IYDighXBVw#jYGbK^eOREyA5*1?yHOuR35-aktF((%%s`6)H3B`w( z7A;IB)&Oqv!XXE&NR}4)8naqG!W0xEu!241{N61pC+|OqO@vG;VNJetN?yeY!xUhVu}4vmmTfiUIM2%Uz5_nS~KLL=!QKueaoBeC_<)97G2M5obABlcN4MQ9Agq?jd& zq4ZKa2!_bYoj%Ck#OkVKasJF?Wz|@T=GX{@D4a%z(qTG*`-ZkTsbA|vXaXG$jNEu`(bjA&DU%3IlM{FGCT`MErz4qq#LG(ZS0$@f zSFgw~$KI_@6qn=RklQ%DbY)qXrqfI*U$Z2E8k1+xLYWqrpf*Tb6sUsqGVQK zDHhQDQQeq8o-Aki7T{_dXvAXhEa=*JoA5*uiK*Aj)^{6n9FgaotCE<8wWtqTP+^@K zs$85Mj@ljD2&-`|>fiFR6UuyK8ap0n9kP$3Eg`c;PTaSVO{ByEGNTQ`?b~898mVX~ zpW)C3`yxdkiP4xlDjoI+Q#Gy8>0}7E1X);K7+;;puUwt1D9fLpfS!hNaWqt1WrWt! zI;QZdMAiIi#|rG{Aktt|rTsMD=`}V;r$C1`nO|zlUq+}SWv0>Tbf!*cfaRK?&=i7tkXqIQS0#XPL2p&B2O;0GWm;yB+G9j)PXW& z_uob6GP)c_3>GXEn|tUqTVo7Qkdl>u#*xMpl1^_UDA8I1`hiJ&bic99$ryV zxK3IEVY;2V%I&)|LU+;K(k21WLbxkTom^hE;7oVgLG*j+KArxE9Z3OnpGN3@$@OY! zVr`X9o7-A`YI!=1?F%i6=zXa_y5(^K$JQe?pjBJ^i^ z24YcO4Y3&GN69&%Z9VQ66Gt5VO+k82QWX*`v3fp2FVKrPs6h}in&&M~543Qv~c z{u!Z~eifmw=^LA_N25)`^@DXyk|6EHj;=0WBRTWC2z@W{3}D&Q%GU%LYEi4K zDy#s=S{4yjBuI;tvN6aS#wJR^UbU=8I4GaWu}72^1vxBjJgmxc>|~Efgwr`{pCgB# zT$n7jJ-~)|O)M)bMxGhua%P0HmJLg2W6L$t8Fev3J zn_BC884XG5kjB6rXdox8&$v)J5XQk&l_WhddqrDNYfQ=l~vcf6?n zt)DcGrrKxw(LP-*({HM8a(NPr^VOlYoT_ho9YfczmBw3;4&JYkP(kyn3gahYF2|D2 zn6x?(KQTomY}W)oV>(ChKAV$`!8+z-kPnl_UgM|O;uMc0!Jm%XVXfOjLFY-XUF0=l zHJ0%^A0}y0wT#i^*k+{L;7vLeV;eq#9mUfllttNTJcDQHJhL74jLiYQa8!h6OTRcP zWja`_BzpvTj+98RUKz%W^CCQ-7eM?FaPh}{DkrW>!G?S_vjZuvwSoyjhF=>kEG|yT z0=8~n{UQ%Li>ESsXpM*1u;i2{Ab`=XS)A!5(BcS}a4Gaq zRoO%wC`^au&TM`Lzc!duTv%C&NJHvCa6#e(Dv$6<3~N$D;6qwvZnVV{9RxfOE8{Ah z>0B+XPS(gR)NE)lYfD3R|&6{Pl@oUa$ZEJs#2O9Rvid< zF^p|KJ;G=3nUL@5Cal)LN3vvox=+VhOh0IPkYVVCE34!2L}lg5YB+b9J_;wv z3>F{Y$ZSGP>j9XlLornF@{|DKfGBGS&><-VSpu|cBf;5CKzbd!G?na>*U(h1mpB_} zncvXLz$!F9xe9jyU^}L1eo|XBX*{5vM@E=8@TEHc);0I7ZFVe}2>(u68<7>ZL1S5j zL55dJL5AxnO(WX^k{WDdgs)<_1nIW2zy4(y@dfxwinopdjChpL}=-d^@~khA-9@1`bj|{vTLe z?{By@$Oi`*?wMAFE2rWhBNpg8rlef)5^xceu#btLh10D5%Pq?ueI|or?UvQhxA1b7 zrdrk{5+_PxI#%LxyGN>SKMyA>T{{x8>|=P>2Gw~B(_%lFoO8S3sjeI{c%UBYcD{TdH1HC;?5H5IEcz`ZfcO7!1??)b1~!_F<2?%c9*=K~LX z@aqfTzqaoEv$uY5dEE!spZETq*L-mKL%SZi>cd+v*mXUm=O0pD9NTQz%Btcpzr*k8 z{4VUDX0~HdSw)fDiOLA?mpI!PFGo0_X4mR7+k@97P!lT*xJ_M zB*Co_Jmrc+WjRyZOLq1WXEn^YLYyYxAIz6yFX8tz9-|_cQj@F6l4rUtV7fVYY`1ZzC zh>efcpg@3NVC($5>(1-nKkv7abA^zWW_>$TmVN)?MB67tb zNQi&k6Jc9V&23lY!RB*IN!jLb;|9r1Ln0zip1Qeha1+AW_5y-p81zJ5Pz;Bvk@g3S zHZfAl=cb?-1>NQvC;pJ07!BQiGBmUsAquP z|AGSd(>=I6-ClfJekp@-kVs6nb%KP|StBQ0`=wNcUdMkB9|Q zWo6q=fOViRK%mwN=fV;d3nOBYI0mjB0@Dy8dB5V@LuvoZgILIvlCHMtAPKYFM|sCW z?AO9mcLSVmejvWhY6gh^X(J$pZ?1A_F+o2pw+++Y%{}sl+kG;8eH@dxQ!3cg&~gsh zeUn8XfLdO>5cZ^TLBMWg}#&sBG!%{h5_%`d2$rQ+nu{|xjcuZzbZ4ok)$ z)UhU=+P8c;cE4gk)_TW})x}yYa_Q2^IHScc5Iz>CV4XOlVe4!Vzl?~}Wc)gSe4N5! zaQrrLMns$`Z-_d;>b8j_^|*BSC(;PnVSPlL-LQk4Dp?d1=fX3v-6DI_EsGZ^1?APn zl}Oxc!t_D$>o!LCdDzxK7ht`v&p=*!3y1i5S zv9)Q5AVm8X>c`d|di_3QYmd9JxxKK`#gZpC)$2iVbF2ORc-hpbfog0*MGt->(%sf7 z@TT-a$fPMFdBFY1*o#Hjq&>*ko$q2A;>TR7h2G`2iR=!Z9`(!{k8=JQ zZM0kI+;oke#%&6@(PCQx>&Kx@g#9?!o!f(h-Lp@V9q~_X@gLl@CY`*MH0w+??6tHuh25jYDeT9+>~(rL`loOf+PzU14@u{_b0T^m zTH&e|yEY|F|3AwKN|;i%hMS7B52S zxS>vAxv4s(!pyi`x*O;y)^dg+&PX&Fv^@eVpF(|UDh=XZFYvZ)B-AvdkMs@wVZrdmh8VY-GdLYEDus?^b?0-dg?r7P>`YV^}g zZ9A8%qXRV@N1r@N^c!;mb##kD1^QOH9ouq8LD1B<^FUK~pmmoeI0^;f8rIEl9l@-B zlxhn?TWJgWKTwb+aWq4c~wDJ2d^0sof#aY~AGxy2~)N-F%9$*F~tF8}l zP9P(A)AyV5B+sfA&;AwyMR>hMrG*f|MUeMn(7qV0OYvILvEbR`z;nyMlgq(n$5R;< z(kb};C9R-yz{Qv0$^U>;Yr&V>!ILk8D|dn;Kcf>_P%-zS63(Ym9#3UFi^};}I*CuD z3Oy}@D@id z#vqemh$R=tBW9k*L&4pvkwY^KGY9CGNX#0Jr#hX(6S*f!L16qfkKmEem$k@6J%~p^ zaW>d%=;puG4It zF0}sK1O-=*O!2g4p4fc=^Z}xQhV}P9@m@*^P!dqzm7goNxaJw z-z**v`5p2k9Sy0LityB-O{JDbyHZPetw`;Yr19OBw9c%NML^Z^?v`?At65h!sH4>y zUXJ#>Avw?nQmmnEZLtnW;U8#fo>-$K#X2a(I_QZt)POD4Aqn2pJ+Tg(A&7N2CDtK` zHL9*yhcf>vtFBmwGGCKbSFA&sZ^^19*7$8C)}hQ#t*4Htg)(=`>PKGnb6Iu8I+VFb zqUDNpD6<|_Ppm^ytWkHx8ugH@yJC%c2U&N;I$(wzu?{vT)~X}c0ZXh^&QYaUU*{9+ zJ8>2g{R+&v9tZn5IJD2jaeN+He~qK#e40-eK+u1Kqv#?C^Cc9g4G`qZz`U1(cdx|T zIvXM4n*iZzjJgIRu11e*(Rw}IMmNx7bR#{D_axq+o9QFE1*zBAFuIjH;T4EcbURPN zOAGVp4lcxQmeZYlI^D$=;~j--p{Vb|`v-M+f8zpc?=SZ19Qx zlpj*`^HQRp=ZQW~t7BY{&Cbi>qb!qY@Q}?sw?IYxXxnn~@#t)DCD9|`(MQ3fkE8Yk zc=S)$+il>{?cmWT!J|7s&Zohn&wxjt1&_V}9(@r!`Z9R*6&x0?(b@DmT}*$ocxWD= zVbLxRVaFUE0^i%mMjJc?r9THpgaW7$>#$HQj_8FJA4kYuyvXeZK2WXQ??Y-^yN``K zh8JU`G`ljPyFJSmNnlISCav4fGR!+FEI58rO1}nU)jW!j-jrvYBR`2DSVPQ+Mr>^+C=FV(a;r*Vos&<{O#v zG_X2L`y9=Dno6UCS$tN?GFbwjg6KW0b|<`=_n{mnR{+Q$7z60~rrz{MxknM1Qo*=cf zyk)5;ugBJ?cymEo9SY`uhR^16(2|a~glr3=H{EZkpa5oH!{=HS#tNEaDV`uOIfT#S zU*jCF#(U)F!`2A{tA3W%k!G<}C(K~MfRb@xz^X5xOaSuEnAycdH??u2}K+S?nI-Lzc$RW}PIw$9Bc?#=U?m3z|fZY~78VhEG zAJhxN*1u`izY*)-bh%sJ*&Q{b+tusMsLfXD6|y9c?2H=qOf$nfvOAa^aK6>@B^xPF zqpotN=?GW_c;wpUnX+5Qf-Ex=XDN7Lbhg`ITgf()z z4e%oycy<$L@p(0Lotd^T-A`(6!pOcr$T!p5-yKBw)I!@aVeD1UYl=i~GpsqQ_K{N3 zPA;;!lJNsj8zO~CX#;rVU9^+O90OJ;) z0^`pu3OF?G2)hv6{_T?l8}G6j3R<-W8*p+?_C^B9bu7T{YICnFJ0yR?Ol$EeX51rZ ze7h|M^&Hk3sCu0f3Y6|(Lc#Hd>e#4(7w zT}fT7$B@%2sf!sfJKFYf4W*|l&_0$Ay!RAS&wR}YdJ9JNt-+Aw5t|u72g|XJs3W3R zTthMWNIJ~!<1KtO9Oo>)u9j~YY@!#2pqRxs<6pSa&Tu{RQ;g9305uQbrw%~taU+0M zTeARn17N@pFyH~)?EthMHv(w2H3KkB$MCBuf^D?mJcpI;ap3538W&DYgN0ecuAvcb zZ~0rtx5<#rdV9oR@S;PN6g`|t4sCguOHyxeQ<7TfHJvbv@9?8oLpib!sAZwyY>1Y{ zcS=*o+FVrblD3Ad43%rn;(KH`#PyrtWXebD9nb0Oe+~7_4!#BUCE>kKyz5C(*yNo# zM7=nT262S)IGsjv6ybml`07dqLWr3(kF%(dvk|_?!CMNQ=v+4G67E9RaaZ_6-Qe$Z zr$@O5{RP(KTil!e&3!n47ZT))lzBV=FR~3p>Q64-+!@3hc?e&P*1LHqzX?O)ADl1J z_#n}RM~Oasut0c1%;7`Cd>$i8xj>x6W5s$NC$8l~#SJ`OJj4^lGdxMW#FNE`e1sx+ zilXsUr58_E`tp&=Xr7_W<(bL?o~4xW9OX2gt6atNlpA@zaw{)Tp5UXE?YvNVhZm_? zyjbnTOVqBsR2|L7sxdxJUBJuKbGT5wj8~{Pb6mZji_~qrQhkb7sW0(r^({U@eTPp} zKjv)p3oh4GuFyJhrPhE_>4Eesk&6}%9`GvFSks%N2Ld$4|Gj9eIVa! zd5mboD<^-1ffdwy@_q0~6+~USI6h%#UBx>XGQiU-u-CHj12ibG8&n?!t2{683E$7P zFrP*SKH|*?GKFbO;61KGDUHSl{>~4e6rst1S9vQ+=`=6!loeo#(mJ)mGVnUkCF)Wu ztkjXNQ)gIVrA(?(C-Z~+5OBUnEx^0W`IK!Lg5zQS*?7i)r;T0A#m@3EZR}#e&Yr6T z0b6^97P?lK-u{c#=5dRU9?>aJ6*6`iW5 zO3H2ze0zX3{WcxB+7POGtYH7f3Pl-P4|?t2Xt{JbyYhb=pRu3gRcn3)&f$Oi3Nruu zm+)V|0v=S4tGfT2BTzMde=0#(NA&u7 z1h@7NfMNsC2`6md{f1$m(Es&%sUA_c{Uf8d5BqDScmVcaFG^c+y^^;7i*PNipZ9V9 zt<4{7AA@^oiM&Z}mwgY@9Cy#MJ3`Cy@~RE*f%ek!y)*}ZI_{;Vh(r(RSWkzL<{NB< zqw%2QaW4uouB_FFtK|i;%<$kx zWy+3y6&&zxD%=)3el4$v^M=SPhsW#q30yXZ&G2@9Q6`C4i6}c{Ndk`4@V#cl3s|SQ zU}U(vz)bT()KN1X5$R|uBAt$iG^%byIvo*dRNaVlIwI1jdUwnU!g{jqMp9+j3hM#v zTk?q&lg4kOm~==6cI9Ik*OQOkz;ojv@p*vssnykqe}rT}Rd(~uX-99-bGHS|?I{D9 zDd6@*E_R>GC+-DzI--oAiFd&*gM+f}P9e+gz*WnT8I{Zj82r`G15vdqo5Y!B*4H`Z*Lt2A|-DW7zpaHo! zy00OCycsueWTJAH%t5e1N~k<9dFn;Go`+bIop+^N#!_E@f?zEWI~#C3oo8` zV=Cf#C#Dh54?B0Hqs2x1SBz8XFmX1&jQB}_rioLnn2JtwMWq!}3DP1_ z0vxwMx2zV&TCtKa)_kLL8TNa`y<`ebI@W)_6)TBaaS@psXU&Qjh%>8o=W5RtbLYZS zcdi&Ti#^wZ$f&3x*vy&kvB>9*RkA|)5<{3w*67dVkYlT^6m zBQb*!G4s?92dgLPQ<4AW(Wq$`|?CU@e*WUX&(#2KZ*MUFfl*9KG+5h`0 zkJ|?x4cR$nGI2z*dGq{?v;N%X#UVthpT(gRm|x}BAcRem7GAfK7G%cBG=wZ=^2JJ? zjm(4s6{qN_GLOuk6Do5(X{wvfgw<}S^Q=ezqN(m zuAy*&E)%6bxCb}&vuPW43Q^(3&zGjaEtynQZ(M7A^a{);+;qv+C@wG zV|)|)-^exmk1thZrK{+G_s9G%>;8Ww|C|38s}=Ys!5WukZGPva;^=`;n0GS?gY(ckBGQb)#=*2=9+;jcIIUYFqYSpo-4BZAKb?uCsAz6S)~3xa4aB$WMg0Rw^(DJ9qv&n0YW#)Tc&|jK;KR4EYhEXe=!nOOM7nxTdGfX2=_oS0_~1 znVD`Yk{N6ZGpB~SnK_g!C&DmEv(0RKWTzVKYO|9) zQgkTDktVX4Q!6^wiA-cOcXn-6!=2MKJ8#$enw@PUS3}hX)U`%a%&wmG+y!&x)Cs(O zUC_;i(cOj7!|b+Qz02(8WOm#vOVUv8Rij>P_HvNvR?xF~ifmiFS@bCAZT2?1!1S&a zJyGgeEBe%mzMxV8YFTw+0O-`m?6X}RZ}xGf8RbsjS2oG{`qwB6&HfJAwiWbq5glMr z+w3PTaWNQ>2ATu6i*DvX8)d9>r#4*p~;?}$t}y$9*${7NIr1P z_cW_)JqXp%L4%qdbEKg+KSVbNWQqLd#x&dCGmdNM;pT82Wu&(oRy>woLnHQWfQ79^ z)@CTvJjMc7%ea1TaO1mv5PLgy{r9$aXZFiH&g|;|?3elJAdh3rep%umL-W-$cN@B|nk5c4LJjKqgACpG zRs;YXVu1M@HpPsz27|^L>ApJF50!DKhtO+Aht$&^W(_;^pI7>aXd7w> zF&q;yqzjDYd2ka8#dtme-_kitOyCQ|;k-#qJ9s8@&+)mucVdbc=9 zeM%gr{#Bf;zA4tIyTm&6OYsXWAWqS8#Hm_;@k{Lxahi6dI9*#J&d^Q}XKL%jS=xEx zSK4nyp0-I`sNE(m(zb|8w8uq%?HO^Y_PY3;wo6>5?G{%AvP6$Scd;=rKwK3#NL(El zE3OGl7S~F%g^x#28)krOwgjfSNd|$bVll4sL6E=^VhK_P6w(3{#Zr`D2?q{?t6K}3 zFfA}n9ETDDYk?Tt@LHr1bPS9Z%TY?FY|M8&N*$*FlIYis-c{d*>pluA{8)We9EP?YoT;86P7o&|T#>KFMKRum>CN-h2{8Ir zQ6HpsK*M^Ck#Q z%yR^JgJS>Z_*`zpz>qgHP6QTd5RE(eA`8RnS6B%p2XGc-oy_?W z=Fn#T2$LN3Bg_HkHse6*xbMg-!=(ij;1aa&%xP397mHBW36S&EvAPHIF4f zKhi`8Y(=iz*egmD+Rq$$SZ}tQkqwa z`0owU&GhZct4MLM@>7&&Wl4s?JJcwf%??f&ytW{U4|{A_tZo+TYQ?En@~cSB;Iuqh zRxYsu>`2ydK6a8}W;oGJ`D?|jAC=whNcFL12+zgowc@OivhXVukj#OuUhrC$?PQK{ z3thc%Ho7{m*>NXRZJ~EFfVCF7HUpR*@*|(t!oX(ch_ukPxj7c&J+gLFMQ@>NQ^01h zg|1#c5C~}J1J&@3pZBp@Cj9T(N64%lXFnnui$-G^(O70QmK}|CipGp+tV=Z3EgI_) zjrEGg`b1;>qOk$dSZ*{nI2y}~#)d^>!=tg0(b%YHY;-g>CK@Y<#>PcsRPn zqN99@)*eQ#8En!w*D%b0)2e%Y4Wl1k^ta(gyw-j-wAP5a6UJjvql-IFJl4g?@KA_l z7~M>F=2$l)+npjF%QkwskmIplMkmvqG}g)JW4d$2`WX0(kuz~@!1}3-^=92vui?8R z&5~i5i0Pay&M{80k$K8);1R=88=;M!U$yW1~}K zSU-hxrUY*K?xUeu;v6ID-I}0!o{{0No^NFOtG_X_{nd+%PX6j8hT*UN))?Tg{?5qt zS1&iZ_^ZD+y7{XcjUN8$CZm_XdX3S?U%k%g=da#i4E9%VGV=V@Ta01;>aE6bfAw}_ zq`!KHG0I=P(-`fq-ffKWSMN0n{MGx6asFzpG2UO@VodN?A225Rs}CBJ{ndw!s4+No zHHK|^)W|UM8niraWE;a9wEW5FWQ=UkvfUV9jBe1f!{}lZG-!F+=w^&-(DIDY%b3uh z|{>*p0XWy9r5! zH&Zup3k?u8G+f+D1>!cEEN-XS;t#m}x&yagcT$?*y_lQ5zW8yw~ zN!(BW5Vaf@oAHwD7Q7r=$8qrhUxXK8Hy~MYlXwKlkB{{5>tAF0QSf8svnV|AtY zmzos+R*S_aYMJ;{tq{A_YVn!6R(!6WBEC>h6JM%lim%l5;v4l`u}3{$e5+n4zEdv| z->a93di8RJ)GHNMH{qq18x&Q&RngQtm4N!75>#JQLh3FhP5oX;*RqwUHdyJP4OKd7 z1xltiRmsv8DA`(}(n%{-I%}sWhIXD}YL_WpwHp*oyF=-r-KF%@?pJzgPbht~*Ok87 zCrZD7rVI#lRR#t|D7k@A%HY7^%8g485&rve+Y8+bz*7x+jyH1M@DUe}ew^iIkIy}xp}K1!LSPf{l9^OPg>LS>3x zu1wWWSElI~DKqq|m6`e-$}D}WGFyLIIZA(BnWOJg=IUQ5^MV0oK`=)-I@nKH7(7T> z6r89W6P&9o4j!)@8>~={3$9m|1us{Y2X9r54?du*2tK34gKsHC!B3S$NGPj9*~;qB z03{h3qnr>rQaLentWsj#@V$#~%E0P(Z}>vX+#9~oGUtXb7+NUaz+II>nW35DZ(^;? zISWn19p_ry^$iG(5r0Q1K*K}B#9JuoR1oSX{((}ECWpF+w^0hw>`;by2c<9_6AFlT zQA(o~!EeQTC`G6&_=%M`n@*SGWo-F%x+wnV*!PQ_xQENY|FpmTw#2k5THP9EgG{4Ywq)TH`__ynasYO%Uoe2P*(wM_j){0F50YK8hQu^XjawHo({ zpP@8ZU8{Z|K1V4}Jw<&_e1Xz1^)&Tu@g+*b)ic$4zAU893oAgwN?BB>#F6n+v?B&h&`6;KzyU@LU%K7W@;jR55-w#85 zEdS@--ygC0VaWdz@4of6=1<6ddr1A3`ruOiXD<9HmB3HTg+J?{|DR8wpIQgi<5i1P zT2z~clbcoKy`G9(s0tl#=7wS0KSr=!pI~Vwv~1+9=KWIT17o~;Hu~q8woE8cuiXr4WHb!tH@TD&awS5 z`KTPNR8W>uNqv-R>8K!84zE_wFxOF`VM-9DFUxc^^yWS!ln{zS34>hL=S3CyMSAZO Iqe|re0cDn~oB#j- literal 36431 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 diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.class index 0e232fd166919e82135bd15c13042a6904982852..fe4253aef13846c0f450f708f043df476fb11dcd 100644 GIT binary patch delta 1257 zcmah|TWl0n82~`6*%TBx4fY#lX)|Cc**rEtVlQrcM`cT@K;HEp)HBBk( zp!8`W)>1^#bc``dpj={;8W3rnb}gX3fchW?V?-mVDBkb)3)uCa*``)re3&!meCPlE z|2zM8&cWpN<$*V+Up@t38CA=05tf=4rHHwj{N@ySUtGDzR}qV+n(t3PkWO@^yE_xj zo4PxjM$h?fp$y@oijVOLp)#j;=^e)Ho3?Jr>8pBMdi0KLx+`n+rZ}iEel`8-b!`dQ zYGk_-&DosM zo0VZ0njBIJxa8vS4U;(9W`}<5<;7hubRLQEfe_J!b`#5OW49W&`elJ z5%2jIwNS9|XWiWN7Ou4RDHKv>G#n`Q+ft_q&lJ~+6XZH3*aII_M3Be3oUspiFZxl5 zoowy^ZpALF#v^FKZfwM(=*DB%fjxKZ!_luJcTJdjS5b|EfEVwR2M@E9#ys|smsChxe2{z$%28Dh6j6_|IjD>ajPo`Nx{RJ8XDpF!_%F*3 zX%34k5QZqg3a;h3i{_c*RecmRmq)7`_Orer_;C=|;Sg5gIixVmts6l*o<{~pu^BI5 z8;+w7W9C3~5rxf>XhI0n0`tS@qCD9zd^U3gJGuOcUquIJ3Uo7&%@0fj&eH|GG@Qzn@~g7pzI%JJS(06 delta 1111 zcmY+DTWnNy5XOJAx3ibi?xnkwrHiG7YFh&<_42UlgP0g=Y9AzNx1fm|cP%x|R-iQ) z6DwL;yrJaq0vG})5^uy(*zQUc^#P)Z_+X-#*dS<(sCXAtD(jrBwYm?p^Z(AweBbv! za~`>2Zz}Zur8nLJu8|f4hp^l_?VfMlF4fj435?&grOH{`+&*!p>P8t(a@yn!UkJYb zfqZXQrhh0WIGbB;bL#;6=bBBtev-W6Cr#K6-h&#MeuN)PcC#nIhx}ynGruU0H5#m6@SDkb?i7q(dr~&%=LLQ@ zY2y#;Xzy0aHw=Qpz=%^_{s5gB8oG{1TL~At50=XJEy^Kz}ZiS7M1+ zAB0*gcR1~kdnQ(g8^lv@$|7m79*u0Y@-@4}oT!Q(br0W)7avHd^$^EPyeD)nJtizI zaYER|1x-E@Qttgs#oZ-75#DAh<%+usoGS2nlrOjK%Rg~)2op!JniipN8Vj4&Avx!T^|mLi|m*3Zy{Q2|#|LZ>vHfR5nDNs{y9Y@6Jr{b4R66QTMMQ(U|e>YA>*V|X) z;pX)Kv{Y*8)apHI%=xyCfPLdna4AutL6bFpjLaFoqJE9asBNC34!-Ry(i!O7 M^oDUUJFdF;3-DzmTmS$7 delta 188 zcmXBLF%H216vpxYYf%-0h8Brfgmf^8uCyp~9l&P5A&d^tlZZ`3Vs!)#fJ=xco!c`}0&>|!v&r4-leWu>3OquA-kSVs#0wObzSaV5T IKv(A2KlXka`v3p{ diff --git a/src/cn/edu/hrbcu/curriculum/controller/CourseController.java b/src/cn/edu/hrbcu/curriculum/controller/CourseController.java index a61b9c7..b17cbde 100644 --- a/src/cn/edu/hrbcu/curriculum/controller/CourseController.java +++ b/src/cn/edu/hrbcu/curriculum/controller/CourseController.java @@ -182,7 +182,7 @@ public class CourseController { if (tbUsers != null && tbUsers.size() > 0) { Speciality speciality = specialityService.selectSpecialityByUserId(tbUsers.get(0).getId()); if(speciality != null){ - ret = courseService.makeCourseCode(9,speciality.getCode()); + ret = courseService.makeCourseCode(9,speciality.getId(),speciality.getCode()); }else{ ret = false; } diff --git a/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java b/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java index a6505e9..c0da9a9 100644 --- a/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java +++ b/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java @@ -265,10 +265,11 @@ public class CurriculumController { List> curriculums = new ArrayList>(); //保存小计信息 Map total = new HashMap(); - double[] t = new double[10];//所有时小计 - double[] t_w = new double[10];//所有周小计 - double[] d = new double[10];//开课，分散时小计 - double[] d_w = new double[10];//开课，分散周小计 + double total_score = 0D;//总学分 + double[] total_hour = new double[10];//所有时小计 + double[] total_week = new double[10];//所有周小计 + double[] disperse_hour = new double[10];//开课，分散时小计 + double[] disperse_week = new double[10];//开课，分散周小计 List curriculums_ = curriculumService.selectAllCurriculumBySpecialityandSemester(specialityId, i); if (curriculums_ != null && curriculums_.size() > 0) { @@ -285,46 +286,68 @@ public class CurriculumController { c.put("name", course.getName()); c.put("identifier", course.getIdentifier()); - c.put("score", course.getScore()); - if(!isDisperse){ - t[0] += (course.getScore()==null) ? 0 : course.getScore(); - }else{ - d[0] += (course.getScore()==null) ? 0 : course.getScore(); - } + c.put("score", course.getScore());//总学分 + total_score += (course.getScore()==null) ? 0 : course.getScore(); c.put("time", course.getTheoretical() + course.getExperiement()); if(!isDisperse){ - t[1] += (course.getTheoretical() == null || course.getExperiement() == null) ? 0 : course.getTheoretical() + course.getExperiement() ; + if(course.getUnit() == null || course.getUnit() == 0){//计算学时 + total_hour[1] += (course.getTheoretical() == null || course.getExperiement() == null) ? 0 : course.getTheoretical() + course.getExperiement() ; + }else{ + total_week[1] += (course.getTheoretical() == null || course.getExperiement() == null) ? 0 : course.getTheoretical() + course.getExperiement() ; + } }else{ - d[1] += (course.getTheoretical() == null || course.getExperiement() == null) ? 0 : course.getTheoretical() + course.getExperiement() ; + if(course.getUnit() == null || course.getUnit() == 0){//计算学时 + disperse_hour[1] += (course.getTheoretical() == null || course.getExperiement() == null) ? 0 : course.getTheoretical() + course.getExperiement() ; + }else{ + disperse_week[1] += (course.getTheoretical() == null || course.getExperiement() == null) ? 0 : course.getTheoretical() + course.getExperiement() ; + } } c.put("theoretical", course.getTheoretical()); if(!isDisperse){ - t[2] += (course.getTheoretical()==null) ? 0 : course.getTheoretical(); + if(course.getUnit() == null || course.getUnit() == 0){//计算学时 + total_hour[2] += (course.getTheoretical()==null) ? 0 : course.getTheoretical(); + }else{ + total_week[2] += (course.getTheoretical()==null) ? 0 : course.getTheoretical(); + } }else{ - d[2] += (course.getTheoretical()==null) ? 0 : course.getTheoretical(); + if(course.getUnit() == null || course.getUnit() == 0){//计算学时 + disperse_hour[2] += (course.getTheoretical()==null) ? 0 : course.getTheoretical(); + }else{ + disperse_week[2] += (course.getTheoretical()==null) ? 0 : course.getTheoretical(); + } } c.put("experiement", course.getExperiement()); if(!isDisperse){ - t[3] += (course.getExperiement()==null) ? 0 : course.getExperiement(); + if(course.getUnit() == null || course.getUnit() == 0){//计算学时 + total_hour[3] += (course.getExperiement()==null) ? 0 : course.getExperiement(); + }else{ + total_week[3] += (course.getExperiement()==null) ? 0 : course.getExperiement(); + } }else{ - d[3] += (course.getExperiement()==null) ? 0 : course.getExperiement(); + if(course.getUnit() == null || course.getUnit() == 0){//计算学时 + disperse_hour[3] += (course.getExperiement()==null) ? 0 : course.getExperiement(); + }else{ + disperse_week[3] += (course.getExperiement()==null) ? 0 : course.getExperiement(); + } } c.put("unit", course.getUnit()); - c.put("hpw", curriculum.getHpw()); - if(!isDisperse){ - if(unit == 0){ - t[4] += (curriculum.getHpw()==null) ? 0 : curriculum.getHpw(); - }else{ - t_w[4] += (curriculum.getHpw()==null) ? 0 : curriculum.getHpw(); + c.put("hpw", (curriculum.getHpw()==null) ? "" : curriculum.getHpw()); + if(!isDisperse){//不分散 + if(unit == 0){//学时 + total_hour[4] += (curriculum.getHpw()==null) ? 0 : curriculum.getHpw(); + }else{//学周 + total_week[4] += (curriculum.getHpw()==null) ? 0 : curriculum.getHpw(); + c.put("hpw", (course.getTheoretical() == null || course.getExperiement() == null) ? 0 : course.getTheoretical() + course.getExperiement()); } }else{ - if(unit == 0){ - d[4] += (curriculum.getHpw()==null) ? 0 : curriculum.getHpw(); - }else{ - d_w[4] += (curriculum.getHpw()==null) ? 0 : curriculum.getHpw(); + if(unit == 0){//学时 + disperse_hour[4] += (curriculum.getHpw()==null) ? 0 : curriculum.getHpw(); + }else{//学周 + disperse_week[4] += (curriculum.getHpw()==null) ? 0 : curriculum.getHpw(); + c.put("hpw", (course.getTheoretical() == null || course.getExperiement() == null) ? 0 : course.getTheoretical() + course.getExperiement()); } } c.put("start", curriculum.getStart()); @@ -342,36 +365,36 @@ public class CurriculumController { } } //保存学期的小计信息 - total.put("score", t[0] + d[0]);//学分不分是否分散，全部统计 + total.put("score", total_score);//学分不分是否分散，全部统计 - total.put("time", double2String(t[1])); - if(d[1] > 0D){ - total.put("time", double2String(t[1]) + "(" + double2String(d[1]) + ")");// + total.put("time", double2String(total_hour[1])); + if(disperse_hour[1] > 0D){ + total.put("time", double2String(total_hour[1]) + "(" + double2String(disperse_hour[1]) + ")");// } - total.put("theoretical", double2String(t[2])); - if(d[2] > 0D){ - total.put("theoretical", double2String(t[2]) + "(" + double2String(d[2]) + ")"); + total.put("theoretical", double2String(total_hour[2])); + if(disperse_hour[2] > 0D){ + total.put("theoretical", double2String(total_hour[2]) + "(" + double2String(disperse_hour[2]) + ")"); } - total.put("experiement", double2String(t[3])); - if(d[3] > 0D){ - total.put("experiement", double2String(t[3]) + "(" + double2String(d[3]) + ")"); + total.put("experiement", double2String(total_hour[3])); + if(disperse_hour[3] > 0D){ + total.put("experiement", double2String(total_hour[3]) + "(" + double2String(disperse_hour[3]) + ")"); } - if(t_w[4] > 0D || d_w[4] > 0D){ - total.put("hpw", double2String(t[4]) + "/"); - if(t_w[4] > 0D){ - total.put("hpw", (String)total.get("hpw") + double2String(t_w[4])); + if(total_week[4] > 0D || disperse_week[4] > 0D){ + total.put("hpw", double2String(total_hour[4]) + "/"); + if(total_week[4] > 0D){ + total.put("hpw", (String)total.get("hpw") + double2String(total_week[4])); } - if(d_w[4] > 0D){ - total.put("hpw", (String)total.get("hpw") + "(" + double2String(t_w[4]) + ")"); + if(disperse_week[4] > 0D){ + total.put("hpw", (String)total.get("hpw") + "(" + double2String(total_week[4]) + ")"); } total.put("hpw", (String)total.get("hpw") + "周" ); }else{ - total.put("hpw",double2String(t[4])); + total.put("hpw",double2String(total_hour[4])); } semester.put("course", curriculums); @@ -438,8 +461,6 @@ public class CurriculumController { type_.put("total", total); type_.put("coursetypename", coursetype.getName()); - - //all_curriculums.put("coursetype" + coursetype.getId(), type_); all_curriculums.add(type_); } } @@ -513,7 +534,7 @@ public class CurriculumController { List speciality_curriculums = curriculumService.selectAllCurriculumBySpeciality(specialityId, is); List courseids = new ArrayList(); for (Curriculum curriculum : speciality_curriculums) { - courseids.add(curriculum.getId()); + courseids.add(curriculum.getCourseid()); } //(1) 查询所有的教育平台 @@ -534,8 +555,13 @@ public class CurriculumController { if(cms != null && cms.size() > 0){ for (Coursemode cm : cms) { coursemode_theoretical_hour = 0D; + coursemode_theoretical_disperse_hour = 0D; coursemode_experiement_hour = 0D; + coursemode_experiement_disperse_hour = 0D; + coursemode_practice_week = 0D; + coursemode_practice_disperse_week = 0D; coursemode_score = 0D; + //(4) 查询该模式下所有的课程 // selectCourseBy Course exampleCourse = new Course(); diff --git a/src/cn/edu/hrbcu/curriculum/service/CourseService.java b/src/cn/edu/hrbcu/curriculum/service/CourseService.java index fd2537f..3f21024 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CourseService.java +++ b/src/cn/edu/hrbcu/curriculum/service/CourseService.java @@ -20,12 +20,14 @@ public interface CourseService { List selectCourseBy(Course course); + List selectCourseBySpecialityId(Long specialityid, Long coursetypeid); + List selectCourseBy(Course course,List ids); int updateCourse(Course course); void deleteCourse(Course course); - Boolean makeCourseCode(int academyCode, int pecialityCode); + Boolean makeCourseCode(int academyCode, Long specialityid, int specialityCode); } diff --git a/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java index 5188283..eb3bc61 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java @@ -127,26 +127,23 @@ public class CourseServiceImpl implements CourseService { @Override - public Boolean makeCourseCode(int academyCode, int specialityCode) { + public Boolean makeCourseCode(int academyCode, Long specialityid, int specialityCode) { // TODO Auto-generated method stub List coursetypes = coursetypeService.selectAllCoursetype(); + if(coursetypes != null && coursetypes.size() > 0){ for (Coursetype coursetype : coursetypes) { - if(coursetype.getId() >= 4L && !coursetype.getId().equals(8L) ){//只有自己的课程编号 - Course c = new Course(); - c.setCoursetypeid(coursetype.getId()); - List courses = selectCourseBy(c); - if(courses != null && courses.size() > 0){ - for(int index = 0;index < courses.size() ; index++ ){ - courses.get(index).setIdentifier( - coursetype.getCode() - + String.format("%02d", academyCode) - + String.format("%01d",specialityCode) - + String.format("%02d",index + 1) - ); - - updateCourse(courses.get(index)); - } + List courses = selectCourseBySpecialityId(specialityid,coursetype.getId()); + if(courses != null && courses.size() > 0){ + for(int index = 0;index < courses.size() ; index++ ){ + courses.get(index).setIdentifier( + coursetype.getCode() + + String.format("%02d", academyCode) + + String.format("%01d",specialityCode) + + String.format("%02d",index + 1) + ); + + updateCourse(courses.get(index)); } } } @@ -182,5 +179,17 @@ public class CourseServiceImpl implements CourseService { return list; } + + + @Override + public List selectCourseBySpecialityId(Long specialityid, Long coursetypeid) { + // TODO Auto-generated method stub + CourseExample example = new CourseExample(); + CourseExample.Criteria criteria = example.createCriteria(); + criteria.andSpecialityidEqualTo(specialityid); + criteria.andCoursetypeidEqualTo(coursetypeid); + + return courseMapper.selectByExample(example); + } } diff --git a/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java index 97f0230..20ad816 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java @@ -272,6 +272,7 @@ public class CurriculumServiceImpl implements CurriculumService{ CurriculumExample.Criteria criteria = example.createCriteria(); criteria.andSpecialityidEqualTo(specialityid); criteria.andAvailableEqualTo(is); + example.setOrderByClause("courseid asc"); curriculums = curriculumMapper.selectByExample(example); return curriculums; -- Gitee