From 679dcc772fc149342837b851cdcb40e86562b3ce Mon Sep 17 00:00:00 2001 From: jinxuesong Date: Fri, 12 Apr 2019 22:10:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/templates/schedule.ftl | 8314 ++++++++++++++++- WebContent/generatorConfig.xml | 4 +- WebContent/jsp/AddTbUser.jsp | 6 +- WebContent/jsp/Header.jsp | 8 +- WebContent/jsp/QueryCourse.jsp | 80 +- WebContent/jsp/QueryCurriculum2.jsp | 110 - WebContent/jsp/QueryCurriculum3.jsp | 467 - WebContent/jsp/QueryCurriculums.jsp | 504 +- WebContent/jsp/QuerySchedule.jsp | 372 +- WebContent/jsp/QueryTbUser.jsp | 18 +- .../controller/CourseController.class | Bin 6322 -> 8237 bytes .../controller/CurriculumController.class | Bin 11588 -> 15433 bytes .../hrbcu/curriculum/mapper/AcademyMapper.xml | 27 +- .../curriculum/mapper/CoursetypeMapper.xml | 27 +- .../edu/hrbcu/curriculum/pojo/Academy.class | Bin 981 -> 1234 bytes .../pojo/AcademyExample$Criteria.class | Bin 3396 -> 4547 bytes .../pojo/AcademyExample$Criterion.class | Bin 2292 -> 2292 bytes .../AcademyExample$GeneratedCriteria.class | Bin 6383 -> 8199 bytes .../hrbcu/curriculum/pojo/Coursetype.class | Bin 990 -> 1214 bytes .../pojo/CoursetypeExample$Criteria.class | Bin 3432 -> 4563 bytes .../pojo/CoursetypeExample$Criterion.class | Bin 2304 -> 2304 bytes .../CoursetypeExample$GeneratedCriteria.class | Bin 6431 -> 8147 bytes .../curriculum/service/CourseService.class | Bin 896 -> 947 bytes .../service/CourseServiceImpl.class | Bin 4076 -> 5740 bytes .../service/CurriculumService.class | Bin 1191 -> 1403 bytes .../service/CurriculumServiceImpl.class | Bin 8892 -> 9620 bytes .../curriculum/service/TbUserService.class | Bin 794 -> 921 bytes .../service/TbUserServiceImpl.class | Bin 3357 -> 4438 bytes .../cn/edu/hrbcu/shiro/ShiroRealm.class | Bin 2800 -> 2800 bytes .../controller/CourseController.java | 36 + .../controller/CurriculumController.java | 168 +- .../hrbcu/curriculum/mapper/AcademyMapper.xml | 27 +- .../curriculum/mapper/CoursetypeMapper.xml | 27 +- .../curriculum/mapper/SpecialityMapper.xml | 29 +- src/cn/edu/hrbcu/curriculum/pojo/Academy.java | 10 + .../hrbcu/curriculum/pojo/AcademyExample.java | 60 + .../edu/hrbcu/curriculum/pojo/Coursetype.java | 10 + .../curriculum/pojo/CoursetypeExample.java | 70 + .../edu/hrbcu/curriculum/pojo/Speciality.java | 10 + .../curriculum/pojo/SpecialityExample.java | 60 + .../curriculum/service/CourseService.java | 2 + .../curriculum/service/CourseServiceImpl.java | 34 + .../curriculum/service/CurriculumService.java | 2 + .../service/CurriculumServiceImpl.java | 31 +- .../curriculum/service/TbUserService.java | 4 +- .../curriculum/service/TbUserServiceImpl.java | 36 +- src/cn/edu/hrbcu/shiro/ShiroRealm.java | 1 - src/cn/edu/hrbcu/utils/CharacterUtil.java | 12 + src/cn/edu/hrbcu/utils/UuidUtil.java | 10 + 49 files changed, 9020 insertions(+), 1556 deletions(-) delete mode 100644 WebContent/jsp/QueryCurriculum2.jsp delete mode 100644 WebContent/jsp/QueryCurriculum3.jsp create mode 100644 src/cn/edu/hrbcu/utils/CharacterUtil.java create mode 100644 src/cn/edu/hrbcu/utils/UuidUtil.java diff --git a/WebContent/WEB-INF/templates/schedule.ftl b/WebContent/WEB-INF/templates/schedule.ftl index 3456c17..cafcf17 100644 --- a/WebContent/WEB-INF/templates/schedule.ftl +++ b/WebContent/WEB-INF/templates/schedule.ftl @@ -5,17 +5,17 @@ Administrator nsow'notepad -2 -1 -2019-04-11T08:26:00Z -2019-04-11T08:26:00Z +3 +0 +2019-04-11T13:53:00Z +2019-04-11T13:53:00Z 1 -43 -248 +107 +611 china -2 +5 1 -290 +717 15 @@ -6840,11 +6840,10 @@ - + - @@ -6866,14 +6865,14 @@ - + - + @@ -6882,14 +6881,14 @@ - + - + @@ -6929,8 +6928,10 @@ + + @@ -6939,15 +6940,19 @@ + + + + @@ -6970,6 +6975,7 @@ + @@ -6995,6 +7001,7 @@ + @@ -7002,18 +7009,20 @@ - + + + @@ -7023,6 +7032,7 @@ + @@ -7053,6 +7063,7 @@ + @@ -7076,7 +7087,7 @@ - + @@ -7085,6 +7096,7 @@ + @@ -7100,6 +7112,7 @@ + @@ -7126,6 +7139,7 @@ + @@ -7217,6 +7231,7 @@ + @@ -7238,12 +7253,14 @@ + + @@ -7256,10 +7273,12 @@ + + @@ -7304,6 +7323,7 @@ + @@ -7311,6 +7331,7 @@ + @@ -7403,14 +7424,14 @@ - - - - + + + + - + @@ -7741,7 +7762,7 @@ - + @@ -7774,7 +7795,7 @@ - + @@ -7928,7 +7949,7 @@ - + @@ -8062,7 +8083,7 @@ - + @@ -8094,7 +8115,7 @@ - + @@ -8126,7 +8147,7 @@ - + @@ -8158,7 +8179,7 @@ - + @@ -8220,8 +8241,9 @@ -<#list maps as map> - +<#list semester1.course as course> +<#if course_index==0> + @@ -8233,21 +8255,21 @@ - + - + - + - + @@ -8368,7 +8390,7 @@ - + @@ -8391,7 +8413,7 @@ -1 +${course.identifier} @@ -8401,7 +8423,7 @@ - + @@ -8423,7 +8445,7 @@ -${map.name} +${course.name} @@ -8455,7 +8477,7 @@ - + @@ -8478,17 +8500,17 @@ -s +${course.score} - + - + @@ -8511,17 +8533,17 @@ -Time +${course.time} - + - + @@ -8535,28 +8557,26 @@ - - + -th +${course.theoretical} - - + - + @@ -8579,17 +8599,17 @@ -ex +${course.experiement} - + - + @@ -8603,19 +8623,17 @@ - - + -hpw +${course.hpw} - @@ -8646,7 +8664,7 @@ - + @@ -8662,20 +8680,31 @@ - + -f-l +${course.start}-${course.end} + + + + + + + + + + +周 - - +<#elseif course_index!=0> + @@ -8687,7 +8716,7 @@ - + @@ -8706,11 +8735,13 @@ + - + + @@ -8724,56 +8755,66 @@ - - + - + + - + - + - - - + + + -小 +${course.identifier} - + + + + + + + + + + + + - - - + + + - - - + + - + - + -计 +${course.name} @@ -8783,15 +8824,16 @@ - + + - + @@ -8804,14 +8846,14 @@ - + + - @@ -8827,17 +8869,17 @@ -s1 +${course.score} - + - + @@ -8845,7 +8887,6 @@ - @@ -8856,23 +8897,22 @@ - -time1 +${course.time} - + - + @@ -8880,7 +8920,6 @@ - @@ -8891,35 +8930,22 @@ - - - - - - -t - - - - - - -h1 +${course.theoretical} - + - + @@ -8927,7 +8953,6 @@ - @@ -8936,37 +8961,24 @@ - - - - - - - - -e - - - - -x1 +${course.experiement} - + - + @@ -8974,7 +8986,6 @@ - @@ -8985,25 +8996,12 @@ - - - - - - -h - - - - - - -pw1 +${course.hpw} @@ -9013,7 +9011,7 @@ - + @@ -9021,8 +9019,8 @@ - + @@ -9035,23 +9033,48 @@ - + + - + + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + - + + + @@ -9063,7 +9086,7 @@ - + @@ -9080,15 +9103,13 @@ - + - - + - @@ -9098,70 +9119,61 @@ - - - - - - - - -春季学期 - - + + - + - + - - + - + + + + + + + +小 + + + + + - -2 + - - - - - - - - - - - - + - + + - - +计 + @@ -9170,16 +9182,15 @@ - + - + - @@ -9192,7 +9203,7 @@ - + @@ -9200,43 +9211,34 @@ + - - - - - - - - - - - - - + - + + - +${semester1.total.score} + - + - + @@ -9244,43 +9246,34 @@ + - - - - - - - - - - - - - + + - +${semester1.total.time} + - + - + @@ -9288,43 +9281,34 @@ + - - - - - - - - - - - - - + - - + + + - +${semester1.total.theoretical} + - + - + @@ -9332,16 +9316,109 @@ + + + + + + + + + + + +${semester1.total.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester1.total.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +<#list semester2.course as course> +<#if course_index==0> + @@ -9353,7 +9430,7 @@ - + @@ -9370,13 +9447,15 @@ - + + - + + @@ -9386,90 +9465,211 @@ + + + + + + + + +春季学期 + - - + - + + - + - + - + + + + + + + +${course.identifier} + + + + + + + + + + + + + + + - + -小 + + + + + + + + + + +${course.name} - + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.score} - + + + + + + + + + + + + + - - + + -计 + + + + + + + + + + +${course.time} - + - + + + + + + + + + + + + +${course.theoretical} + - + - + @@ -9477,22 +9677,32 @@ - + + + + + + + + + +${course.experiement} + - + - + @@ -9500,22 +9710,32 @@ - + + + + + + + + + +${course.hpw} + - + - + @@ -9523,22 +9743,6873 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + + + + +<#elseif course_index!=0> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.identifier} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +小 + + + + + + + + + + + + + + + + + + + + + +计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester2.total.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester2.total.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester2.total.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester2.total.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester2.total.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<#list semester3.course as course> +<#if course_index==0> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +二 + + + + + + + + + + + + + + + + + + + +年 + + + + + + + + + + + + + + + + + + + +级 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +秋季学期 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.identifier} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + + + + +<#elseif course_index!=0> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.identifier} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +小 + + + + + + + + + + + + + + + + + + + + + +计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester3.total.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester3.total.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester3.total.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester3.total.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester3.total.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<#list semester4.course as course> +<#if course_index==0> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +春季学期 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.identifier} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + + + + +<#elseif course_index!=0> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.identifier} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +小 + + + + + + + + + + + + + + + + + + + + + +计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester4.total.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester4.total.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester4.total.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester4.total.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester4.total.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +软件工程 + + + + + + + + + + + +本科专业 + + + + + + + + + + + +人才 + + + + + + + + + + + +培养方案实施进程表 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +年 + + + + + + + + + + + + + + + + + + + + + + + + +级 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +学期 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +课程 + + + + + + + + + + + + + + + + + + + + + + + + +代码 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +课程名称 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +是否 + + + + + + + + + + + + + + + + + + + + + + + + +核心 + + + + + + + + + + + + + + + + + + + + + + + + +课程 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +总 + + + + + + + + + + + + + + + + + + + + + + + + +学分 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +学时 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +周学时 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +（课内） + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +考核 + + + + + + + + + + + + + + + + + + + + + + + + +方式 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +备注 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +总学时 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +讲课 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +实践 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<#list semester5.course as course> +<#if course_index==0> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +三 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +年 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +级 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +秋季学期 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.identifier} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + + + + +<#elseif course_index!=0> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.identifier} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +小 + + + + + + + + + + + + + + + + + + + + + +计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester5.total.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester5.total.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester5.total.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester5.total.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester5.total.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<#list semester6.course as course> +<#if course_index==0> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +春季学期 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.identifier} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + + + + +<#elseif course_index!=0> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.identifier} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +小 + + + + + + + + + + + + + + + + + + + + + +计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester6.total.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester6.total.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester6.total.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester6.total.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${semester6.total.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<#list semester7.course as course> +<#if course_index==0> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +四 + + + + + + + + + + + + + + + + + + + +年 + + + + + + + + + + + + + + + + + + + +级 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +秋季学期 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.identifier} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.theoretical} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.experiement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.hpw} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + + + + +<#elseif course_index!=0> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.identifier} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.score} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.time} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +${course.theoretical} + - + - + @@ -9546,22 +16617,32 @@ - + + + + + + + + + +${course.experiement} + - + - + @@ -9569,13 +16650,23 @@ - + + + + + + + + + +${course.hpw} + @@ -9584,13 +16675,16 @@ - + + - + + + @@ -9603,39 +16697,63 @@ - + + - + + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + - + + + + - + - - + - @@ -9645,98 +16763,112 @@ - + + + + + + + + + + + + + - + -二 - - + + + + + + + + + + + + + + + - - + + -年 +小 + - + + -级 +计 - - + - - + - - + + - - - - - - - - -秋季学期 - - + - + @@ -9744,6 +16876,7 @@ + @@ -9754,65 +16887,58 @@ + -3 +${semester7.total.score} - + - + + - - + + + - - - - - - - - - - - - - + + - +${semester7.total.time} + - + - + @@ -9820,43 +16946,34 @@ + - - - - - - - - - - - - - + + - +${semester7.total.theoretical} + - + - + @@ -9864,21 +16981,34 @@ + + + + + + + + + + + +${semester7.total.experiement} + - + - + @@ -9886,34 +17016,25 @@ + - - - - - - - - - - - - - + + - +${semester7.total.hpw} + @@ -9922,7 +17043,7 @@ - + @@ -9930,8 +17051,8 @@ + - @@ -9944,16 +17065,15 @@ - + - - - + + + - @@ -9961,10 +17081,11 @@ - +<#list semester8.course as course> +<#if course_index==0> + - @@ -9974,7 +17095,7 @@ - + @@ -9991,13 +17112,15 @@ - + + - + + @@ -10007,60 +17130,80 @@ + + + + + + + + +春季学期 + - - + - + + - + - + - - - + + + -小 +${course.identifier} - + + + + + + + + + + + + - - - + + + - - - + + - + - + -计 +${course.name} @@ -10070,15 +17213,16 @@ - + + - + @@ -10091,7 +17235,7 @@ - + @@ -10099,22 +17243,32 @@ - + + + + + + + + + +${course.score} + - + - + @@ -10122,22 +17276,32 @@ - + + + + + + + + + +${course.time} + - + - + @@ -10145,22 +17309,32 @@ - + + + + + + + + + +${course.theoretical} + - + - + @@ -10168,22 +17342,32 @@ - + + + + + + + + + +${course.experiement} + - + - + @@ -10191,13 +17375,23 @@ - + + + + + + + + + +${course.hpw} + @@ -10206,16 +17400,18 @@ - + + + - - - + + - - + + + @@ -10226,23 +17422,47 @@ - + + - + + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + - +<#elseif course_index!=0> + @@ -10254,7 +17474,7 @@ - + @@ -10271,12 +17491,12 @@ - + - + @@ -10289,16 +17509,6 @@ - - - - - - - - -春季学期 - @@ -10307,7 +17517,7 @@ - + @@ -10330,7 +17540,7 @@ -4 +${course.identifier} @@ -10340,7 +17550,7 @@ - + @@ -10353,6 +17563,17 @@ + + + + + + + + + +${course.name} + @@ -10361,7 +17582,7 @@ - + @@ -10383,7 +17604,7 @@ - + @@ -10397,15 +17618,26 @@ + + + + + + + + + +${course.score} + - + - + @@ -10419,15 +17651,26 @@ + + + + + + + + + +${course.time} + - + - + @@ -10441,15 +17684,26 @@ + + + + + + + + + +${course.theoretical} + - + - + @@ -10463,15 +17717,26 @@ + + + + + + + + + +${course.experiement} + - + - + @@ -10485,6 +17750,17 @@ + + + + + + + + + +${course.hpw} + @@ -10493,14 +17769,14 @@ - + - - + + @@ -10515,7 +17791,7 @@ - + @@ -10529,10 +17805,34 @@ + + + + + + + + + +${course.start}-${course.end} + + + + + + + + + + +周 + - + + + @@ -10544,7 +17844,7 @@ - + @@ -10565,7 +17865,7 @@ - + @@ -10586,7 +17886,7 @@ - + @@ -10640,7 +17940,7 @@ - + @@ -10661,7 +17961,7 @@ - + @@ -10676,15 +17976,27 @@ + + + + + + + + + + +${semester8.total.score} + - + - + @@ -10699,15 +18011,27 @@ + + + + + + + + + + +${semester8.total.time} + - + - + @@ -10722,15 +18046,27 @@ + + + + + + + + + + +${semester8.total.theoretical} + - + - + @@ -10745,15 +18081,27 @@ + + + + + + + + + + +${semester8.total.experiement} + - + - + @@ -10768,6 +18116,18 @@ + + + + + + + + + + +${semester8.total.hpw} + @@ -10776,11 +18136,18 @@ - + + + + + + + + @@ -10791,13 +18158,14 @@ - + + @@ -10897,7 +18265,7 @@ - + diff --git a/WebContent/generatorConfig.xml b/WebContent/generatorConfig.xml index e21b60d..88ae127 100644 --- a/WebContent/generatorConfig.xml +++ b/WebContent/generatorConfig.xml @@ -100,11 +100,11 @@ --> - +
- +
diff --git a/WebContent/jsp/AddTbUser.jsp b/WebContent/jsp/AddTbUser.jsp index a42886b..da5af04 100644 --- a/WebContent/jsp/AddTbUser.jsp +++ b/WebContent/jsp/AddTbUser.jsp @@ -76,16 +76,16 @@
- +
- +
- +
diff --git a/WebContent/jsp/Header.jsp b/WebContent/jsp/Header.jsp index 4807154..cce3f03 100644 --- a/WebContent/jsp/Header.jsp +++ b/WebContent/jsp/Header.jsp @@ -32,7 +32,7 @@ diff --git a/WebContent/jsp/QueryCourse.jsp b/WebContent/jsp/QueryCourse.jsp index f828772..159c33d 100644 --- a/WebContent/jsp/QueryCourse.jsp +++ b/WebContent/jsp/QueryCourse.jsp @@ -24,6 +24,45 @@ location.href = '<%=request.getContextPath()%>/CourseController/DeleteCourse.action?id=' + courseId; } } + + function addCourse(){ + $.ajax({ + url : '<%=request.getContextPath()%>/CourseController/toAddCourse.action', + success : function(data){ + alert(data); + } + }) + } + + function makeCourseCode(){ + $.ajax({ + url : '<%=request.getContextPath()%>/CourseController/MakeCourseCode.action', + async: false, + timeout : 30000,//超时时间：30秒 + dataType : "json",//设置返回数据的格式 + success : function(data){ + console.log(data); + if(data == 'successful'){ + alert("编号成功"); + window.location.href = window.location.href; + }else{ + alert("编号失败"); + } + }, + beforeSend : function() { + //请求前的处理 + $("#mymodal").modal('show'); + }, + complete : function() { + //请求完成的处理 + $("#mymodal").modal('hide'); + }, + error : function() { + //请求出错处理 + $("#mymodal").modal('hide'); + } + }) + } @@ -95,13 +134,50 @@ - 增加课程 + + + + - + + + + + + + \ No newline at end of file diff --git a/WebContent/jsp/QueryCurriculum2.jsp b/WebContent/jsp/QueryCurriculum2.jsp deleted file mode 100644 index a9776fe..0000000 --- a/WebContent/jsp/QueryCurriculum2.jsp +++ /dev/null @@ -1,110 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> - - - - - - - 课程列表 - - - - - - - - - - - - - - -
- -
    -
  1. - 培养方案管理 -
    2. -
  2. 培养方案管理
    3. -
- -
- - -
- -
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%-- --%> - - - - - - - - - -
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周
${curriculum.id }${course.name }${course.identifier }${course.score }${course.theoretical }${course.experiement }${user.id}${curriculum.hpw }${curriculum.start }${curriculum.end } - 更新 - 删除 -
-
- - - - - 增加课程 -
- -
-
- - - - - \ No newline at end of file diff --git a/WebContent/jsp/QueryCurriculum3.jsp b/WebContent/jsp/QueryCurriculum3.jsp deleted file mode 100644 index 396bac3..0000000 --- a/WebContent/jsp/QueryCurriculum3.jsp +++ /dev/null @@ -1,467 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> - - - - - - - 实施进程表 - - - - - - - - - - - - - - - - - -
- -
    -
  1. - 培养方案管理 -
    2. -
  2. 实施进程管理
    3. -
- -
- - -
-
-
-

备选课程

-
-
-
- - -
- - - - -
- - -
- -
- - -
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - -
ID课程名称
${course.id }${course.name}----${course.score}0${course.theoretical}${course.experiement}0117
-
-
-
-
- - -
- -
-
-

实施进程表

-
-
- - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周
##小计----00000--------
${curriculum.id }${course.name }${course.identifier }${course.score }${course.theoretical }${course.experiement }${user.id}${curriculum.hpw }${curriculum.start }${curriculum.end } - 更新 - 删除 -
-
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周
##小计----00000--------
${curriculum.id }${course.name }${course.identifier }${course.score }${course.theoretical }${course.experiement }${user.id}${curriculum.hpw }${curriculum.start }${curriculum.end } - 更新 - 删除 -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- - - -
-
- -
-
- - - - - \ No newline at end of file diff --git a/WebContent/jsp/QueryCurriculums.jsp b/WebContent/jsp/QueryCurriculums.jsp index 1cbf024..7e99c6f 100644 --- a/WebContent/jsp/QueryCurriculums.jsp +++ b/WebContent/jsp/QueryCurriculums.jsp @@ -147,33 +147,43 @@ function compute_total($whichbody){ var total = new Array() var $dest_trs = $whichbody.children('tr'); + //var $dest_trs_avaliable = $(":checkbox:checked").closest("tr"); + var $dest_trs_avaliable =$whichbody.find(":checkbox:checked").closest("tr"); - for(var i = 0; i < $($dest_trs[0]).children().length - 1 ; i++){ + //初始化小计的数量 + for(var i = 0; i < 20 ; i++){ total[i] = 0; } - for(var i = 0;i < $dest_trs.length; i++){ + //先根据理论学时 + 实验学时 计算机总学时 + for(var i = 0;i < $dest_trs.length; i++){//所有行 var $dest_tds = $($dest_trs[i]).children(); if(i < $dest_trs.length - 1){//前面的行 - $dest_tds[4].innerHTML = parseInt($dest_tds[5].innerHTML) + parseInt($dest_tds[6].innerHTML); + ""; - - for(var j = 0; j < $dest_tds.length ; j ++ ){ - if(j >= 3 && j <= 7){ - total[j] += parseInt($dest_tds[j].innerHTML); - } - } + } + } + + //计算开课的小计 + var $dest_tds = undefined; + for(var i = 0;i < $dest_trs_avaliable.length; i++){//所有行 + $dest_tds = $($dest_trs_avaliable[i]).children(); - - }else{//total 行 - for(var j = 0; j < $dest_tds.length ; j ++ ){ - if(j >= 3 && j <= 7){ - $dest_tds[j].innerHTML = total[j] + ""; - } + for(var j = 0; j < $dest_tds.length ; j ++ ){ + if(j >= 3 && j <= 7){ + total[j] += parseInt($dest_tds[j].innerHTML); } } } + + //设置小计的内容 + $dest_tds = $($dest_trs[$dest_trs.length - 1]).children(); + for(var j = 0; j < $dest_tds.length ; j ++ ){ + if(j >= 3 && j <= 7){ + $dest_tds[j].innerHTML = total[j] + ""; + } + } + } function set_button_state(state){ @@ -225,25 +235,13 @@ }) } - function print_all_data(){ - <%-- $.ajax({ - url : '<%=request.getContextPath() %>/CurriculumController/ExportSchedule.action', - type: 'POST', - datatype : 'json',//后台返回的数据 - //contentType : 'application/json', - success : function(data){ - console.log("success : " + data); - } - }) --%> - } - // 保存所有学期的进程表 function save_all_data(){ for(var s = 1; s <= 8; s++){ save_semester_data(s); } - set_button_state(false); + set_button_state(false); } function save_semester_data(no){ @@ -262,13 +260,12 @@ obj['end'] = parseInt($(tds[9]).text()); obj['hpw'] = parseInt($(tds[7]).text()); obj['sort'] = 0; - + obj['available'] = tds[10].firstChild.checked; + // curriculums.push(obj); } } - console.log(JSON.stringify(curriculums)); - $.ajax({ url : '<%=request.getContextPath() %>/CurriculumController/UpdateCurriculum.action', type: 'POST', @@ -278,7 +275,13 @@ success : function(data){ console.log("success : " + data); } - }) + }) + } + + function checkboxOnclick(element){ + var $TBODY = $(element).parent().parent().parent(); + compute_total($TBODY); + set_button_state(true); } @@ -343,6 +346,7 @@ 0 1 17 + @@ -379,16 +383,17 @@ - - - - + + + + + @@ -403,7 +408,11 @@ - + + @@ -417,6 +426,7 @@ +
ID课程名称课程编号学分ID课程名称课程编号学分 学期学时 理论学时 实验学时 周学时 起始周 结束周开课
${curriculum.experiement } ${curriculum.hpw } ${curriculum.start }${curriculum.end }${curriculum.end } checked="checked" + onclick="checkboxOnclick(this);" /> +
0 ---- --------
@@ -426,37 +436,42 @@
- - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + @@ -466,9 +481,10 @@ - - -
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周开课
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end } checked="checked" + onclick="checkboxOnclick(this);" /> +
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end }
##
## 小计 ---- 00 ---- ----
+ ---- + + +
@@ -476,37 +492,42 @@
- - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + @@ -516,9 +537,10 @@ - - -
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周开课
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end } checked="checked" + onclick="checkboxOnclick(this);" /> +
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end }
##
## 小计 ---- 00 ---- ----
+ ---- + + +
@@ -526,37 +548,42 @@
- - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + @@ -566,23 +593,220 @@ - - -
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周开课
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end } checked="checked" + onclick="checkboxOnclick(this);" /> +
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end }
##
## 小计 ---- 00 ---- ----
+ ---- + + +
- <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周开课
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end } checked="checked" + onclick="checkboxOnclick(this);" /> +
##小计----00000------------
- <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周开课
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end } checked="checked" + onclick="checkboxOnclick(this);" /> +
##小计----00000------------
- <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周开课
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end } checked="checked" + onclick="checkboxOnclick(this);" /> +
##小计----00000------------
- <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周开课
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end } checked="checked" + onclick="checkboxOnclick(this);" /> +
##小计----00000------------
diff --git a/WebContent/jsp/QuerySchedule.jsp b/WebContent/jsp/QuerySchedule.jsp index 1cbf024..c806df1 100644 --- a/WebContent/jsp/QuerySchedule.jsp +++ b/WebContent/jsp/QuerySchedule.jsp @@ -264,6 +264,8 @@ obj['sort'] = 0; curriculums.push(obj); + + // } } @@ -293,308 +295,96 @@
-
-
-

备选课程

-
-
-
- - -
- - - - -
- - -
- -
- - -
-
+ +
+ + +
+ + +
+
+

${coursetype.coursetypename }

- -
- +
+
- - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + +
ID课程名称ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周开课学期
${course.id }${course.name}----${course.score}0${course.theoretical}${course.experiement}0117
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end } + + 已开 + + + 未开 + + + 未定 + + ${curriculum.semester}
##小计----${coursetype.total.score} ${coursetype.total.time}${coursetype.total.theoretical}${coursetype.total.experiement}${coursetype.total.hpw}----------------
+
-
-
- - -
- -
-
-

实施进程表

-
-
- - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end }
##小计----00000--------
-
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end }
##小计----00000--------
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end }
##小计----00000--------
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周
${curriculum.id }${curriculum.name }${curriculum.identifier }${curriculum.score }${curriculum.time }${curriculum.theoretical }${curriculum.experiement }${curriculum.hpw }${curriculum.start }${curriculum.end }
##小计----00000--------
-
- -
-
- <%-- --%> -
-
- <%-- --%> -
-
- <%-- --%> -
-
- <%-- --%> -
-
- - - - - + -
-
- -
+
+ + +
+
diff --git a/WebContent/jsp/QueryTbUser.jsp b/WebContent/jsp/QueryTbUser.jsp index a761f9b..3b61058 100644 --- a/WebContent/jsp/QueryTbUser.jsp +++ b/WebContent/jsp/QueryTbUser.jsp @@ -33,13 +33,6 @@
- -
    -
  1. - 系统管理 -
    2. -
  2. 用户管理
    3. -
@@ -56,16 +49,17 @@ ID 登录名 + 操作 - + - ${course.id } - ${course.loginname } + ${user.id } + ${user.loginname } - 更新 - 删除 + 更新 + 删除 diff --git a/build/classes/cn/edu/hrbcu/curriculum/controller/CourseController.class b/build/classes/cn/edu/hrbcu/curriculum/controller/CourseController.class index ff602896133ebbbbf088a08d469e5ab59f0938db..d7fef5a5413306fa540a40660dabeae5162f328e 100644 GIT binary patch literal 8237 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 L=DSyoMbrNPAHS&O literal 6322 zcmbVQ>3`JL6+Ie{M}tQ=VE}_^3zTd&7zAMpHcM=?#O>G^o0yWMCGw1H3uYuoqp>kb zNf)woNzyGX-S>S9ghC8yx^L;e@BJ(Kxxb$GBx^JtPi*IdN7B=K_nvp|J@;Mt<^NrO z3BV5gM@3A*_N=X&xspES4rfbxw&c22wv;aw^sHlhu9MH3uHNmG+@jeX4ycGLxcRg( zVd#0o9@UQypEk3ef~8qGanN)ptgNX(&(tzr^rr-tg9RN5ng>d@XBEsLt7r}9%}(2P zJj1gbyQtuDZElg!5yn+ptTIe@K&U>a?A&Ol!;nwgj%?K)l)J@y#H%5sd z=@Od|OC3uC6lghf#3<#xAs?W!Z3zckHPj=~fKAw}qK%5EVo$>s=(J|pGb?;xu4C zIz@VS3Cyz*w+^W|sGx1GnpP{@8qkeZNgQE(q8THGdo;WOZ)8}DrY91!kGaD75Y6yG zPgKs1)}bVN86$z%huMvz8v1ce!4e~vnTzX`l z4bNlB7o)V)C~Ft>GE-Jp%*Z9u8xU-hAFps?7_!Bbu;Msd0kg}=P0`}gNY(6`Qn06G zLCghWu0*#onoV6(0XR{)&S=P^z#bx6hJ?G_i*gqRiNF(C*(WKuZ9#x}I#%qoC#T@n zs5&!_&~+s9192)?Rk^L6T*!LNlC@q@F`?j=TBS0QaSbS8mH3&`a1Iai^kS(IP-beI zB-Dp8B#3*fhVytdtf+o^bWMpRnT1lf09@oV>GLTp2NEx1QK0&7PqFZH=5js^9$tF* z5DE6<8lJ$D6uZSVbAvNSLCXU1_9XFc*7Om_oiyBBdsX8cjYb#=?I6!LkL|T+vK6e* zqt6j+PiuGv?~`Y9bpArIvFl2CPPl2&bwnNmKjIwykcJer6h4fLDn6oMTdg37LdQNo z*kz>0)$mbqlr9gCQh#q^hH&t44NK9O!YA=*6`xwLgGlSE;WKkN5Ho~>&uO>`H>dCg zd`ZO@*)GnvgE_ll4PO>cR)xE$oFyE6Rl_o*Q}{Z*sp1>#1?O{At3%fCE#YfT=&NdC z63;1UC?{UcHBknk)|fmgL! zz?7>GEY5djAf$z^#aXDL*FVZU=ic$0QPyG;B@!J8RFcH^dHU$lH%stC{8+`0Sb@r2 zvERRF_z8Z>4WDUt-Bve5$m}*ph?)g`~hF(7Hn#NrU`fgzV$+l~_yFGpb-6yZ%PS$*x?#Ba&)7l+)Gu}c*PSM7CzVqil z7|u7s`NN#AAd4K|3C7aAmKifK!Z8ts6C986x>PU|leA+A6dBf{fQ; z&J^)#l$kt@$6`2|`WhjiK+xfHMW}sp03n($As5&rE2ZilN%gDb@@l z;-)$@3f>>4VC8l`AlxX2gV0QbQq1t~gVT6ck@Ec5G(JIja_qCy_`HJlIB&l)jj!>x zenzT^=0y72LaK@M0HZ^tCeoMMf}7`k$tKd@2~?a&Uu&-SUzSsC7Xt<+L<6&S1&LV; z3#~X!`JTZ(eyJQp0llPdh~YZLl(LvqMYwYB_sHa$2qx4|-9USp(7@>`62E(^;oqYK=ZiF^owvM z)%1YRznZ?}^RK3#5BOIZ37>zJkx0l$sO3m>@hkz(l7lHScn<6EFgD^57SZ#pL64$` z;_0V+9-wqgip9nSOyV()JkFGU0?*<}8I=KlzhUBE3=+QqPs{kkX#IkW4^IsG67h-C zlP%*@Pk&h%p9DP~mGMy{@ewve_3~{@lU?7&_0Yx*M#Z=BqCC|8SR+1vl5*>(Em7QN uWc}wD_EqccDa!g8xjVlUR?9j?D}Te^rFj2AdolboEPemtbNLAP_x}OLBZ*}I diff --git a/build/classes/cn/edu/hrbcu/curriculum/controller/CurriculumController.class b/build/classes/cn/edu/hrbcu/curriculum/controller/CurriculumController.class index 846935ee9b65ab134a7b142fa560be986d9f4a96..0b42616bc68e2d6a8e567ea6f8a6d834155a8aae 100644 GIT binary patch literal 15433 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 literal 11588 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 + @@ -64,7 +65,7 @@ - id, name + id, name, code @@ -134,6 +143,9 @@ name = #{record.name,jdbcType=VARCHAR}, + + code = #{record.code,jdbcType=INTEGER}, + @@ -142,7 +154,8 @@ update academy set id = #{record.id,jdbcType=BIGINT}, - name = #{record.name,jdbcType=VARCHAR} + name = #{record.name,jdbcType=VARCHAR}, + code = #{record.code,jdbcType=INTEGER} @@ -153,12 +166,16 @@ name = #{name,jdbcType=VARCHAR}, + + code = #{code,jdbcType=INTEGER}, + where id = #{id,jdbcType=BIGINT} update academy - set name = #{name,jdbcType=VARCHAR} + set name = #{name,jdbcType=VARCHAR}, + code = #{code,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/build/classes/cn/edu/hrbcu/curriculum/mapper/CoursetypeMapper.xml b/build/classes/cn/edu/hrbcu/curriculum/mapper/CoursetypeMapper.xml index e69be59..ce1d933 100644 --- a/build/classes/cn/edu/hrbcu/curriculum/mapper/CoursetypeMapper.xml +++ b/build/classes/cn/edu/hrbcu/curriculum/mapper/CoursetypeMapper.xml @@ -4,6 +4,7 @@ + @@ -64,7 +65,7 @@ - id, name + id, name, code @@ -134,6 +143,9 @@ name = #{record.name,jdbcType=VARCHAR}, + + code = #{record.code,jdbcType=VARCHAR}, + @@ -142,7 +154,8 @@ update coursetype set id = #{record.id,jdbcType=BIGINT}, - name = #{record.name,jdbcType=VARCHAR} + name = #{record.name,jdbcType=VARCHAR}, + code = #{record.code,jdbcType=VARCHAR} @@ -153,12 +166,16 @@ name = #{name,jdbcType=VARCHAR}, + + code = #{code,jdbcType=VARCHAR}, + where id = #{id,jdbcType=BIGINT} update coursetype - set name = #{name,jdbcType=VARCHAR} + set name = #{name,jdbcType=VARCHAR}, + code = #{code,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/Academy.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/Academy.class index b300aa1fee951fd1a400d3b8adad75f0a81c6956..1f8bfb5d5a9bb3b4382a77de736c1ef605aeba21 100644 GIT binary patch literal 1234 zcma))%Wl&^6o&tCE~ddH_momfX%k8=P;)6OP$g7^6qJ@lAp40kN*ofqa%?1cA+{h< zkXW!q;-P>u9;bDpEQpjj*164h{yD$@{P+pr5KnYy3^mI!#UL<8Uf&8#EATwq3MRqS zJafmc`P||IG5w$;$&efK_uQOtXK23ekA>yyNHdf|ukD&$;n{p*f8_m%V9@LVRdg;( zI<7N(%8+#Ul){Brr0aXOidpV}V#Qdj?f7CSJSxo1!u~zs&1~0s+kU~oUNNj6yUxt# zj^E>xK%{6e`C|;}XSQSeM+}L2qeu51Q|}BCs2C`q$dK*WjyMgbec`=P$c2t;@kx)< z7&JoUO!^~x#<1V{ADIXORiW+EPkCY+#rzB+8=hnLueijWb8Kh*Gn`xr=;G+-U^WFGRVeC zkUQ9qiboMhzS;T(oqdAd`i8sbs7j^;q#TNA3ppBHN}`zZ7fkt3bB22q+l1C8jsH@q yMpmaSnp=kZI9P#fE+g-(M1F`zQSpLy=CXEG(ykWcOkZ%O< delta 509 zcmZvY!A`nO9-2u}xXD1Y;~WGeHh7{y9u{j2o3KGB=vom5=e&Sp znJXbHu^RpqTW`9h!qH5NsB*5%+<+bIvJzY#xoRGx{>qOc#=>1#>)uBrb6+x|V3X+w z6Vw;GEnRhZV_8qArd`>7#il-}un*8&A&CutjFv`OBB`t;Il^(~zR5@&KbS$%3uN$) s_5>{jmD7V#D3>o+TY_@tP>#MfdGOidLR?AEAA1F>L}#vqK-~#v|6159asU7T diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/AcademyExample$Criteria.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/AcademyExample$Criteria.class index 8d40068aacaa1ba204fc8831dd5cedaa3c9faac9..ea4791fd8076ef67c964aa3c7e5673d9dfcf1ca2 100644 GIT binary patch literal 4547 zcmb`JS$7mg6vzKXLWYD3Sx{tAabd{<8I^!&01YvOfib9w5fRbOOqq1(=?OhOEbfZ? zzVChmAM`2b_}~ZdLwUTnr#kd#QRl?*C6%e_-`(ooy7$k&e*Xi&2!76CjlxJN%iJSViu_VNs8{k!)x~OltmKt-Ao#T-o>&W+VXjeG08gf#HI`U#& zPDLnm9QH#$KB~~xKQOD%K3*;BF0`SOuofK(-9~%D= z;Drh&`iqO+B`+U%;e5VW4d+K&&~r1P51SN-?Vs{0nyoKnbkt)%$QS)u+=`B^gw41` zVWWxBF&$slnzfwIdQu2uJ+GtDjC1K$3;x|k*oN&2n^||ET-3Fi1o3ngA7Myhyxurb^e=F#pR{<;g1z?=hLKn3HCC~96Gw$pSylhT#T_8rhy9Jj zER-|Xb%=0KLepoA$kc`eVwCWJaGmD35X$aR!r>$Z=XE?51Zm;26fV-FnyzQMe1DAa z5FTzwk(_8qnIMddl#Kr-S%f)3I4-HSl{Gh&Y*V(KA{4}Ykzooh;) zG2f-an?8D;a9%#j_>+lAiQq|w%k!ATF?}Azz!wN*N#zyCRx0mIHkpzqE>m}{K6#6T zc`R_La4w{YAm&sE7v#>^GW`Any>~ zN{>Vlr-M8aa`ZmoU9mwfT8>gpO&9$U;RE?7eZ@23`IPXnSR*C*4_`(67lhA*?3%9D zqmn-EOBdeMJQNH|5poy{A$R!kz^m1CEr)LvhE~y#71pH}n!^tY2UfwRQ%RNkQm2t3 z|M&iD=HNG*@1KVsU=ZyxW$^DD|Ju*1;&tudGS>aZ|Exh5|Lx)xY99|f!&uM1sqqo7 z8-SiM>GMXwu8e@5UsnW(e3p>FEQ%3s*#_Co!g&uJgG0->$;EIBwlP~=47X0h>|u|^ z=iK1X-euhCg1DL56zy;^+yuj%;$pZH+L-%Y47W!c^Pr32=4oS&xEOArhRKF{%!P1wwW)c;#cL z8Vu8XsdFxfhY15^6HdDj9t5m6!1f<;f@LU?*GNYjH|bum0wSk%;har6bAIIQkm za_Qmm!)Du67sG>z#kQAS2+u1vHLtlCo@Fd*-gF^6<5-ZlT?o%UHp|{~F+2*{m=9eH v&qy}r6BomSla2ZOh73;wUnUvy6~5+m8+UDmZ}1&D@jb6U^4iAhPwn(Ks`f8s literal 3396 zcmbuAS$7mg6vzKXh71`BvY^PK2*{EJX_ZAZfQA^tU^^%Y5fO#TbeVMM=?=YsekULF zDd+g$2k_hI2k>xjPqp+Mi#jLdA*r6K`rWLrFxP3QnrH}I+YY&?W1Xs82bBnc;j3XB z=GO&=CZ|>e8uLk@TNuKK#BK}=jQU}$J4J6*r^{+J(gG8H(pAxlA`9rZ*=*$NVJ2|d z-;Ozz6|(|kDh}GgVyelyba`FH0=Fjp4fRZUk&4$mKZ)07r(RDwyE87aAEN@2^mJ5D zcapqa(^2GMhYqtqP?U zv~MNuv6iDIXs=501Bv@An(N;Lmm|9OWR6-JG5|w}qoFh}y4B(J>c8z1hZ` za52tbj$*qG}sh6aXV2J3Ck1<^DxP(42jE`&O{RZrUmQJc5u@m&bDe}fFX?K>`p z27^V-(yxwoKqJHI&WcM9%@3Px-?{X+Vs^egGtRKkX;*z(Lh Ls~x%6bK)NUKVl_1 diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/AcademyExample$GeneratedCriteria.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/AcademyExample$GeneratedCriteria.class index d7679fd4a2058daea56a7728467ac8030383919a..b8bd828b7bcdc6709b18b5e0826463c5ec628055 100644 GIT binary patch delta 1283 zcmaKq$xjnu7>9rFP`c1zX+esX0~}DHkj5o3k(QuFv=Jc~4sy^q&9C-xUZ&4VbA*3!_qM+7?YIVU_?pDy>gFExe_j9s4X|0C`}i#7Ec#dstb37Z)ytK%SElA?ty0rMS?x96 z=o9HcKJs|i;yUl!K)rY3ERNTWqiZDdA*FmR&;~|TD4=S!xngyTHX_EckB24j{X46u r_bWuzaMW5YYD;dEfR7w3;1fP`UBh41g)jKZ)2`?GjVp2eZWI3jt{^M0 delta 97 zcmZp7cyB0h>ff$?3=9k=42Remm>3ysCoa^PT+b-D(f14YWJ`V{mVJy2+7lOQPoBl^ x#;CaYA^%-&O(uq2KpjjByBYQXX(9doP%lA9L7^N1xo@0Rvca(<$3}uL#1$k8 z5(lnGd?;Ync1dCdQA^&jXa6(vo7w&O>)Uq#kMK~3#&BdgrWgd~$m?5yX$77qt-uZ@ z=F}a#X3Gt{neg9Dg^n~sVa(rh)8@|5eAyoh%h!=*sDxhWnqA>ZZp-()Zwm%Z4k)5C z59zqh@G(Q$;S<^}E$noCPeyx|JD|P7EX>ps-b}jA>-JLy_MBn8R}AoC(@DrDMPAO?@@&oWyv9h4Fg4#81fzIh_hhQ7v8G~uGDcYZud9=6Kw2E`y)AH zsCOlfEY<1@{e+#af#IeB9al(3LsYVIEvZtxIwd&^hf-Ne6OTnDIxw(? z97!orB;8m{6)Wq#9F9=eQCm8zXxBgkdo&!H^@L{G^||%t1)s*fD+V<-RqVvT)r(@v z$B^sNMXb!I=^p>foN|<3YQXwj@&{Us_`gYiV5@bIKvb7TA5O-pbQ4CUSG=D&6AD}nC;O;s0 z6;ldo91+tF3aBnH75_37!=xVIAdIElQw650GO@^KRR UfRGRWfvm2_C6Mn^PZ}Ql0bVe}<^TWy delta 508 zcmZvY%}&BV6otjWnr?LK8rMESSEw;v7~{qT&(QQ0Ox$V$lDJ@N z;zRflJ^*@W+5jPJ=1lI~bM7~HQv8wD_w;iD;2dX(l_oDebIV2Vpb&3Uy$?) v8GPV)gtmez=%5VB<;~R>pqv?$qqj{Se73j{R}%EcUcoBSnJFPqd&22I%4;mu diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/CoursetypeExample$Criteria.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/CoursetypeExample$Criteria.class index e2b432bdb9ffaeaeb251585cbc26086a71cbc760..c28bac8a66381a84822b5b3d34eb6cbcc8ecb2c5 100644 GIT binary patch literal 4563 zcmb`JSyvoI6vzJ^NG6a<0;rh9Et-W*MvV%Q7(gX)~`A^R9vG*sUkxTwz*+hq>oqPqJNHpPIeXN+zW0#aKoAWL>&3y%ux4# z79d8oD{RAd2a2K!4aeT+bLM?x5ebM?|rk z6>bupMP{L#s^#Fs3SX^Hhy4n-V6TG~%8}?77>`s&E%t+a(XYnq4115l0d&>v6d9>C zV&|<2y-O*Par$iv{i4_wt(fGb00$Lr7oc6gr`s~r-HMgX-8Sw@JQ=D=EYTA5kivlY zTTt0t^0l&u zzZS}4k;kuCB!wcI6ABNfp-Sx1p_)>dOl=ayGd4Y;@K|b-4n^IjClyYMO&!|UWune1 zJSA7=5S4mAipuTYW8cXLy0%b3t`NvsgbC0EKnqs2vqnz%IQSEt;-FDL!sv^e{Dg-f_x zzgi&LP;mtHe%j^>c-&1%; z1h*zvv&QPwhYIhfQPL4lOZpRqkA#qKo%W`V)8`7GF00s#lfF{;B9Sz~HeK?L`_dje zSM=AFKmmxNdC94moKTllQ%hq!J9+J>d)>I?Ss zB+p_~Pwyhye!p^q2;db7&3!U#n3_32RYaLwPjBBMuC_sJr6xhw+8B0L6SK?4uxn~& zAJ^0)H`ow1Q;js*v&ROpGis>8ar!@g@`9Ekwt-QOhWjE&()U}B!OF&r68jB8^! zOK2t=p0W+$m|;L>YzW5>lV)=^hSP|NnYS?OT{o literal 3432 zcmb`I+jbO16o&sILxv0mIjE6?q9}(PFr%UZ29Yp^I5G@sVpLGEGgBrVdU`@1K;Ov= zy~!zF5x1xc@pGL7se%dk1KYG2Lz?^ABeqtiutD>TCeUI>p2~FfBrdvo+ z7`^I;esWD=WM+0RDxh4Gdjns(aTFwvT~5g3K3R=?u~>mH5Z?|ie8 zZ27UmmDV0DDhydvnDD}Gv%3-*8W^o@d7;9snbx-V$g2llxLI%Y!_CFnXI3CiO==v) zxPqptw%0T5e$p(dNfSS)xBNKSrEIFnzEtVY3 zExBQm$Hvf>`(>9`lgOvjr6A-x`wPQM8pm-$;mDAEV%94fFN;~V>?8}1Y`>=QsyK8w zx3=X!U?JSLn7Tj1&S|`kGlTpzyQOf=YMjr)wP}*2ASkMa#W*uNh|Yhx6NBH-n8Uon zSZ;7Ll-)Nq7Q~I?nRlg18%oVZjkiSCWX>`QB}?AZe7ZETn#mZ*y`phR1!}qUh zyf4z^OiHe(2C?TujSoatNmE`2a(YAKx@1Y-g^Eh#6lI{jJ75iI7x$v&+!u``>GPC;MV& zwm(RTARP^_ILe!gyc0S4L8B{rj^%oaA{eSWUt?1)P34zLMvIIAhB6;qu<_Vovqh(#CQ@@;&*)2*PPF zqnwDqDO6R&j_FFm-#^$0MrBn>_naE>?S z?&#e7E+&5A*Fb_O0RM#MIT?0q8}q!2Vf(f*FS;0Z-JCg3m&NJo-28=IoOD5K$Tmf% zTnxLljXCXN*m-TtSr@~mY-46z3>$OKoaI_%_<{>z*S4vtyBPLx8}qh{VQ057@46Uv zej9Vy#c(3nm_--ENnvBIxfsrmoEfgSB^SiWkVEDCEV~f4bgQ1G3u3>w=xMnS&Vd{m zdfRtg3@3y|&FasNcEH(Tb!XkBhl9js+t)6JBgSIeH!g(J$Aa8!XVP2j$*+zyJUM diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/CoursetypeExample$Criterion.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/CoursetypeExample$Criterion.class index 1bba73c90f49b9c996d2a1b315150dc858647d4a..5d9718f896e148bc1bf611d8956f643c45265b3d 100644 GIT binary patch delta 193 zcmZn=Y7pA6jfK&7vLUPJx zR&45wnLw8CZ!CVFw#ykd2#(V}o#sUUm#=^<_*fJGMfTE>9(K4WDIZ(8ML5i`G zL7uUSL5Z=NL7lO7vIl!5YXbv2W8>sw>{*g6K=rLa^=&})?LhS%43dnU404QJlRY^y PSbG^b82ct~QUn!c-^nE@G0H>yNw!OYT?PueslFzoh^>s$s8> N&RHDDL83F~^aoosB1HfI diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/CoursetypeExample$GeneratedCriteria.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/CoursetypeExample$GeneratedCriteria.class index 72041b8ae049c77611796ecc41243a72ed669db6..7ba2f6b3feecb0a4b7ae5170585c408df9d8b212 100644 GIT binary patch delta 1169 zcmaLVOHUI~6bJDCnHD;2r_dJYfMrn@YG|9(sBu-m7a9@*F=0buBvmG{v9{8du?m>#Gcm7YZ^?5tLp0oXA%aMP4C<|AP^-q<2=D@+!G=;8z@zK$FerPMDUq3+f9htVryB;RkiZa?p#sE ztkaA^+yeSwK&@SOD!aP~jdo?fR;gHJx16#pq4l5aU|DQ+&gqinETi6a41Z z3j9cLzLK}!&kHpf4+$X?6!|DDz(?kNP2Hf-=Y2LJL6;VN#ETo9U#!H>}1NQID@^=08CJ z@imAR#5fX8n`+8XYre7i?y9D7fNhW~w!jOCV?#1}HWi)GMmwx;suCpg=|*_7`vpFUy1%s&}J>lq@@^`86p|>GVEvIWY7W92Y@sqkUq%50|3KR7Lxz~ diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CourseService.class b/build/classes/cn/edu/hrbcu/curriculum/service/CourseService.class index 28fb1188519ec301a083119a87241c95e2b5a5d5..76cfc9543e403495148378ffee98b71bcd410c6e 100644 GIT binary patch delta 100 zcmZo*-^?y>>ff$?3=9k=4ASfjOpFY=lLeV1Hfo$=(&Woc%uaRAFD)ttk}0W-4B{G| zo|-;ciDilUIf;4c`cC=zIjMff$?3=9k=43g{&OpFY=lLeV1Hfo$=nk>t#&B!s?lR1KmfssKRsDz0@ F0suhc3DW=o diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.class index 7d3632a845115e5b1a75a3b72fe8441ca1a9a7ec..e91c9d6f26e83a981d8bc34bdb463a204d68e68c 100644 GIT binary patch literal 5740 zcmbVP3wRV)75?vLli4Ig0^t!N6cGwdLc*4oM`0;8K}eS_ff5>oV(Daek__z5rn9p^ zs9&ajZG$>(9)hG z?%Iez)3&T>8!5fl$QXS|y~8xqwq_e?Gb36)#tw+vfn<^)#Jm-6*pm=}yxj(LAI2xFOoi>bR(pA}ZG6@$L+S*2V_y7u^T)mdxH4K1_RV{7q!JYYOcYJxPx!gkK6^2xKe1{&fD`UDo1B*}NU z`e;Q(0t`>(fNn<Kxu`87a*gzDggKF!SZt;eZy#ZmJ)Q zox@UjtgPZ%M%gZ>|F$AlwhLA zmTe8|_a@w;;ARG@SikO^iq}X5K`u;%@Hzp=#jjU!2yftVtlyB;l4Pfu{`|OIT%=`} zf;S2@o~^PoYa|o86~dbY#G)D;##>|?^VYMpc)qo;1`gv66>r0xG$`9UlNoLI8_X~D zLDwDfOmTyUahHmB$gPCzv^yyew|A*{H{L_K;29+Y6f^cQNYM$EmjPt&EGhE1Ou|tW z@0Dd)&m_2Tlg*uxkoNCZ@qT$m&Z2$)+y)uf?W~5nl(x?UsciZfPKW!7G3`vJlWayK zvd#LCidv|(_%Mzs_(<6exv$q$@lh-w3%DpRbWL(aEk2I>6nrAzNfg>A6`zz0AIumx zI*UG~;y50Vl+PwcV}s1?tC4)tdT2(sn6sJ%lM3 z6}YI3yh#6RFoL*jhaOS!C?4a9l4OfhJd-w6@+u?$f--4r%QSpZ#pC#r(^`~dZbF(Q zP6eJ&u^$IysJ^1&G@j&X$E-_a=TC2kgFOGGOJ7s*^?ZrCZT(I7rfkl>C9v3!!+ceZ z19>Eb?=Vh_F2012is5@w`1>;EB_@k!^-cJpiXY*}tfv07mD1?mYQG_`ny&R3`hT{6 z;@DnB+ZukR;^(rE*}U)s;_++r8@eR}^Gg*L8fC(Nt>QO$nw&JKWxAc*@=~*_2EW4} z6#TxVh48Q~H}s6$&@O+2ng_lt-nf>~Q^Rh7)MbYBxS=Ht+Z(8jI~*@DK&GlGehHLy zI!Qrx6e3QaU16%JG|Ys4P$1$)sZb1Mv9qIb9d*|9(6zX}(U4cRSuO$iZe2@dRj^x_ z@Cuq?73pcID(s0+p&B(!-CCd2G8wtqQ2s)ImoNtv{9lOx|M4=$_iBQ@ioZ4d4M^rV zYfR>i*GoR@xgyM8(myI&Phjc;jz|NaQUSPNI-gPj7hncv@|Qb8BcD?ErH)ykw)G** zUNVXo1#lmS11PF!bX3gZ7?*h}ocIK+lv9le$Tn1w6Q zLDK@ASYL4AWsVD@l#;x$e9lqS&3O?Fh0llN;K>#Nk36Jd`vU?a9a+y=kWF%-noNAM@~U)m%ll@&jIp8z*#^T1KoUXAyBWTGusG(YnaboY$XJC z69f|6E_n77!n?-{Z-^jr!865?>>xCDj{}c8k_V59z<+Utf<+2eNECel_qZ_)tfU{3 zQ_e8q9~{NK0^RMW@ND}iJ|=KCp61K_0&6Od;mM}TQ9LN{IgH3k$l>7}PR_t*?>dU( zC!w*JKfk7`smh!ALTgi14yV>AP0A_U(WH3#4ppoS9fRGZ%nXg<%K<9WWK5;dS4Z#- zMz-PG!ADWCvtrH&zS}c`A27fTPq{;LeM8==nW5nI#Ze~{KW+7E&*2w4ZVicgkru P@xMHQR*(k&jq3ja8!!an delta 1700 zcmZ`(OLS9J6y5hF&3k!yP1-{Lg_fp&S_3v(6Q23rUst*|#1gU8CILrV`>=qsFF793;egM82ZlT)E|*ps zP@#EHjan5o0&TL_T{Zu8Ns)m%l*_2{iL*(dgQtEuwUOi#WsQJu|yy;o(>$EJ~);Rq*JlUnLuAM9#19=Y{vug_o61(PV}qTB}-ft^#d3b z&|-4q{B6SL;b8 zV&Dlx<+tiNI!_vyL|hJON9ar&m|;hL(SFiGIAY)^j>(VRe%EoFQ1OiX*r zHSivK1S-Ob@xr@phtuK7eM!05H=7Yq%;7`8P5HQJby_zq)xouxUVxUBpr~U3-p{#F zP{P#=1_MgDnxPCp8J5usEJrz4GkG(k6e0ZvRaRP~g&L=V9rXQI;U8TXtlY~QYOw(uE&dhQWK|%r1-*F=TP+TY%qk*au=XOnwO^nwiyc?6 zdn89`fIM0TyW9nYIu}7g>zvh2la!NP%z!1TbXL)Agb&TAL<|3Rt=zR?E!r)DLHnV6 zYl7I1VG^uli%hBtGpa1A4(2#8f`^DVN?da=_Q}IMd4wkp2pv|2mgfgdXPs*34{4-!ZcL}2PRRc4lCdH5z-G8X9jAG9S^rjTZhwkl_>n*U&n zO+|!mk^rUo)HMW5lf~0zC$o6&0vfumVs5l7b9w|*I;y+ zHj9gvoNreTC>f3K?c}D$jK4_j5(0t)4O63R6=s!=Ppf{K}9 uirvAaTNPxVEGfu<@)x$K@T=(dG4>KED0n~r1^Iyfhy3YmV>c;XhWlSu#{63V diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumService.class b/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumService.class index 5e4f5f09768684668f1d6cf8776cef3bb2bd79cb..b766f8836e4ff532cb7db0d050f5a49a626dd222 100644 GIT binary patch delta 168 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 KfR*Z6)c!yBKY+Oa literal 8892 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 LdkvPV)rkE9<(<9D diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/TbUserService.class b/build/classes/cn/edu/hrbcu/curriculum/service/TbUserService.class index c3ba3137ff84e57f1522a70931580cebaf3d3c89..3a76580ce50737a0dde4479504251a88faa6209b 100644 GIT binary patch delta 169 zcmbQmHj`c8)W2Q(7#J8#7^K-5m>3y!Cl@kGOw_PqveKAbz^E#s>64XMmZ+bTn3t~a zl%JoInwV!jv3u3zrHmSko|}ys6B&7Vic-@vi%U|AToOwXCnjhyMopf?q|3-L`2drw zD-Qz$3nK$B10R^?XAl6>f($|oj0~JWdzl!7f$|~@qHw+#kT1?40hD88kOZrc0sscw BA7=mn delta 102 zcmbQqK8ua()W2Q(7#J8#7$hcgMND>Q)Sfth#pWW$c*e=x%-W3Xlg*iBZP^$YSQr_2 m7X6g-6b8QhcxzRMj4H4 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 SEqb5E2lOiRAEM6Lg!~&(ZkzuA diff --git a/build/classes/cn/edu/hrbcu/shiro/ShiroRealm.class b/build/classes/cn/edu/hrbcu/shiro/ShiroRealm.class index 76b98277ea6c1830c99fa61243162394a89ea36e..7e7fb35011cbc6313edc6f81d7fa5872ad2711f1 100644 GIT binary patch delta 57 zcmew$`ayI9FPE-70~do5gBXJ<5UMd4F=#NjF=#XRGUzdcFc>mKF_ tbUsers = tbUserService.selectUserByLoginname((String) subject.getPrincipal()); + if (tbUsers != null && tbUsers.size() > 0) { + Speciality speciality = specialityService.selectSpecialityByUserId(tbUsers.get(0).getId()); + if(speciality != null){ + ret = courseService.makeCourseCode(9,speciality.getCode()); + }else{ + ret = false; + } + } + System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + ret); + if(ret){ + return "successful"; + }else{ + return "failure"; + } + } } diff --git a/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java b/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java index 4f1ae27..9d35b3b 100644 --- a/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java +++ b/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java @@ -14,9 +14,7 @@ import org.apache.shiro.SecurityUtils; import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; @@ -24,15 +22,18 @@ import org.springframework.web.servlet.ModelAndView; import com.github.pagehelper.PageInfo; import cn.edu.hrbcu.curriculum.pojo.Course; +import cn.edu.hrbcu.curriculum.pojo.Coursetype; import cn.edu.hrbcu.curriculum.pojo.Curriculum; import cn.edu.hrbcu.curriculum.pojo.Examinationmethod; import cn.edu.hrbcu.curriculum.pojo.Speciality; import cn.edu.hrbcu.curriculum.pojo.TbUser; import cn.edu.hrbcu.curriculum.service.CourseService; +import cn.edu.hrbcu.curriculum.service.CoursetypeService; import cn.edu.hrbcu.curriculum.service.CurriculumService; import cn.edu.hrbcu.curriculum.service.ExaminationmethodService; import cn.edu.hrbcu.curriculum.service.SpecialityService; import cn.edu.hrbcu.curriculum.service.TbUserService; +import cn.edu.hrbcu.utils.CharacterUtil; import cn.edu.hrbcu.utils.WordUtils; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -50,6 +51,8 @@ public class CurriculumController { private SpecialityService specialityService; @Autowired private TbUserService tbUserService; + @Autowired + CoursetypeService coursetypeService; @RequestMapping("/QueryCurriculum.action") public ModelAndView QueryCurriculum( @@ -100,6 +103,7 @@ public class CurriculumController { c.put("hpw", curriculum.getHpw()); c.put("start", curriculum.getStart()); c.put("end", curriculum.getEnd()); + c.put("avaliable", curriculum.getAvailable()); curriculums.add(c); } @@ -116,7 +120,22 @@ public class CurriculumController { public ModelAndView CheckCurriculums(Long specialityid) { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("/CheckCurriculums"); - + // 获取专业id + if (specialityid == null) { + Subject subject = SecurityUtils.getSubject(); + List tbUsers = tbUserService.selectUserByLoginname((String) subject.getPrincipal()); + if (tbUsers != null && tbUsers.size() > 0) { + Speciality speciality = specialityService.selectSpecialityByUserId(tbUsers.get(0).getId()); + if (speciality == null) { + return null; + } else { + specialityid = speciality.getId(); + } + } else { + return null; + } + } + ///////////////////////////////////////////// if (specialityid == null) { return modelAndView; } @@ -143,7 +162,8 @@ public class CurriculumController { c.put("hpw", curriculum.getHpw()); c.put("start", curriculum.getStart()); c.put("end", curriculum.getEnd()); - + c.put("avaliable", curriculum.getAvailable()); + curriculums.add(c); } } @@ -153,6 +173,40 @@ public class CurriculumController { return modelAndView; } // + + @RequestMapping("/QuerySchedule.action") + public ModelAndView QuerySchedule(Long specialityid) { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("/QuerySchedule"); + //获取专业id + if(specialityid == null){ + Subject subject = SecurityUtils.getSubject(); + List tbUsers = tbUserService.selectUserByLoginname((String) subject.getPrincipal()); + if (tbUsers != null && tbUsers.size() > 0) { + Speciality speciality = specialityService.selectSpecialityByUserId(tbUsers.get(0).getId()); + if (speciality == null) { + return modelAndView; + }else{ + specialityid = speciality.getId(); + } + } else { + return modelAndView; + } + } + ///////////////////////////////////////////// + if (specialityid == null) { + return modelAndView; + } + //////////////////////////////////////////// + List coursetypes = coursetypeService.selectAllCoursetype(); + modelAndView.addObject("coursetypes", coursetypes); + + List> curriculums = queryCurriculumsByCoursetype(specialityid); + modelAndView.addObject("allcurriculums", curriculums); + + return modelAndView; + } + @RequestMapping(value = "/UpdateCurriculum.action") @ResponseBody @@ -189,7 +243,7 @@ public class CurriculumController { return "successful"; } - private Map queryCurriculumsBySemester(Long specialityId) { + private Map queryCurriculumsBySemester(Long specialityId, boolean available) { Map all_curriculums = new HashMap(); for (int i = 1; i <= 8; i++) { @@ -221,8 +275,15 @@ public class CurriculumController { t[4] += (curriculum.getHpw()==null) ? 0 : curriculum.getHpw(); c.put("start", curriculum.getStart()); c.put("end", curriculum.getEnd()); - - curriculums.add(c); + c.put("available", curriculum.getAvailable()); + + if(available){//若果只查已开课的 + if(curriculum.getAvailable()){ + curriculums.add(c); + } + }else{//所有课程全部查询 + curriculums.add(c); + } } } //保存学期的小计信息 @@ -242,18 +303,91 @@ public class CurriculumController { return all_curriculums; } + private List> queryCurriculumsByCoursetype(Long specialityId) { + //Map all_curriculums = new HashMap(); + List> all_curriculums = new ArrayList>(); + + List coursetypes = coursetypeService.selectAllCoursetype(); + if(coursetypes != null && coursetypes.size() > 0){ + for (Coursetype coursetype : coursetypes) { + //保存每个课程类型所有的课程和小计信息 + Map type_ = new HashMap(); + //保存每个课程类型所有的课程 + List> curriculums = new ArrayList>(); + //保存小计信息 + Map total = new HashMap(); + double[] t = new double[10]; + + List curriculums_ = curriculumService.selectAllCurriculumBySpecialityandCourseType(specialityId, coursetype.getId()); + if (curriculums_ != null && curriculums_.size() > 0) { + for (Curriculum curriculum : curriculums_) { + Map c = new HashMap(); + Course course = courseService.selectCourseById(curriculum.getCourseid()); + c.put("id", course.getId()); + c.put("name", course.getName()); + c.put("identifier", course.getIdentifier()); + c.put("score", course.getScore()); + t[0] += (course.getScore()==null) ? 0 : course.getScore(); + c.put("time", course.getTheoretical() + course.getExperiement()); + t[1] += (course.getTheoretical() == null || course.getExperiement() == null) ? 0 : course.getTheoretical() + course.getExperiement() ; + c.put("theoretical", course.getTheoretical()); + t[2] += (course.getTheoretical()==null) ? 0 : course.getTheoretical(); + c.put("experiement", course.getExperiement()); + t[3] += (course.getExperiement()==null) ? 0 : course.getExperiement(); + c.put("hpw", curriculum.getHpw()); + t[4] += (curriculum.getHpw()==null) ? 0 : curriculum.getHpw(); + c.put("start", curriculum.getStart()); + c.put("end", curriculum.getEnd()); + c.put("available", curriculum.getAvailable()); + c.put("semester", CharacterUtil.num2roman(curriculum.getSemester())); + + curriculums.add(c); + } + } + //保存学期的小计信息 + total.put("score", t[0]); + total.put("time", t[1]); + total.put("theoretical", t[2]); + total.put("experiement", t[3]); + total.put("hpw", t[4]); + + + type_.put("curriculums", curriculums); + type_.put("total", total); + type_.put("coursetypename", coursetype.getName()); + + + //all_curriculums.put("coursetype" + coursetype.getId(), type_); + all_curriculums.add(type_); + } + } + + return all_curriculums; + } + + @RequestMapping("/ExportSchedule") public @ResponseBody void ExportSchedule(HttpServletRequest req, HttpServletResponse resp){ - Map dataMap = queryCurriculumsBySemester(3L); - - try { - WordUtils.exportMillCertificateWord(req, resp, dataMap, "本科专业人才培养方案实施进程表","schedule_12.ftl"); - //WordUtils.exportTestWord(req, resp, data, "本科专业人才培养方案实施进程表","test1.ftl"); - - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + // 获取专业id + Speciality speciality = null; + Subject subject = SecurityUtils.getSubject(); + List tbUsers = tbUserService.selectUserByLoginname((String) subject.getPrincipal()); + if (tbUsers != null && tbUsers.size() > 0) { + speciality = specialityService.selectSpecialityByUserId(tbUsers.get(0).getId()); + + Map dataMap = queryCurriculumsBySemester(speciality.getId(),true); + + try { + //WordUtils.exportMillCertificateWord(req, resp, dataMap, "本科专业人才培养方案实施进程表","schedule_12.ftl"); + WordUtils.exportMillCertificateWord(req, resp, dataMap, "本科专业人才培养方案实施进程表","schedule.ftl"); + //WordUtils.exportTestWord(req, resp, data, "本科专业人才培养方案实施进程表","test1.ftl"); + + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } } } diff --git a/src/cn/edu/hrbcu/curriculum/mapper/AcademyMapper.xml b/src/cn/edu/hrbcu/curriculum/mapper/AcademyMapper.xml index 90bce91..23e23e5 100644 --- a/src/cn/edu/hrbcu/curriculum/mapper/AcademyMapper.xml +++ b/src/cn/edu/hrbcu/curriculum/mapper/AcademyMapper.xml @@ -4,6 +4,7 @@ + @@ -64,7 +65,7 @@ - id, name + id, name, code @@ -134,6 +143,9 @@ name = #{record.name,jdbcType=VARCHAR}, + + code = #{record.code,jdbcType=INTEGER}, + @@ -142,7 +154,8 @@ update academy set id = #{record.id,jdbcType=BIGINT}, - name = #{record.name,jdbcType=VARCHAR} + name = #{record.name,jdbcType=VARCHAR}, + code = #{record.code,jdbcType=INTEGER} @@ -153,12 +166,16 @@ name = #{name,jdbcType=VARCHAR}, + + code = #{code,jdbcType=INTEGER}, + where id = #{id,jdbcType=BIGINT} update academy - set name = #{name,jdbcType=VARCHAR} + set name = #{name,jdbcType=VARCHAR}, + code = #{code,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/mapper/CoursetypeMapper.xml b/src/cn/edu/hrbcu/curriculum/mapper/CoursetypeMapper.xml index e69be59..ce1d933 100644 --- a/src/cn/edu/hrbcu/curriculum/mapper/CoursetypeMapper.xml +++ b/src/cn/edu/hrbcu/curriculum/mapper/CoursetypeMapper.xml @@ -4,6 +4,7 @@ + @@ -64,7 +65,7 @@ - id, name + id, name, code @@ -134,6 +143,9 @@ name = #{record.name,jdbcType=VARCHAR}, + + code = #{record.code,jdbcType=VARCHAR}, + @@ -142,7 +154,8 @@ update coursetype set id = #{record.id,jdbcType=BIGINT}, - name = #{record.name,jdbcType=VARCHAR} + name = #{record.name,jdbcType=VARCHAR}, + code = #{record.code,jdbcType=VARCHAR} @@ -153,12 +166,16 @@ name = #{name,jdbcType=VARCHAR}, + + code = #{code,jdbcType=VARCHAR}, + where id = #{id,jdbcType=BIGINT} update coursetype - set name = #{name,jdbcType=VARCHAR} + set name = #{name,jdbcType=VARCHAR}, + code = #{code,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/mapper/SpecialityMapper.xml b/src/cn/edu/hrbcu/curriculum/mapper/SpecialityMapper.xml index 3110934..07db0bb 100644 --- a/src/cn/edu/hrbcu/curriculum/mapper/SpecialityMapper.xml +++ b/src/cn/edu/hrbcu/curriculum/mapper/SpecialityMapper.xml @@ -5,6 +5,7 @@ + @@ -65,7 +66,7 @@ - id, name, tbuserid + id, name, tbuserid, code @@ -146,6 +153,9 @@ tbuserid = #{record.tbuserid,jdbcType=BIGINT}, + + code = #{record.code,jdbcType=INTEGER}, + @@ -155,7 +165,8 @@ update speciality set id = #{record.id,jdbcType=BIGINT}, name = #{record.name,jdbcType=VARCHAR}, - tbuserid = #{record.tbuserid,jdbcType=BIGINT} + tbuserid = #{record.tbuserid,jdbcType=BIGINT}, + code = #{record.code,jdbcType=INTEGER} @@ -169,13 +180,17 @@ tbuserid = #{tbuserid,jdbcType=BIGINT}, + + code = #{code,jdbcType=INTEGER}, + where id = #{id,jdbcType=BIGINT} update speciality set name = #{name,jdbcType=VARCHAR}, - tbuserid = #{tbuserid,jdbcType=BIGINT} + tbuserid = #{tbuserid,jdbcType=BIGINT}, + code = #{code,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/pojo/Academy.java b/src/cn/edu/hrbcu/curriculum/pojo/Academy.java index 2471182..d2b9513 100644 --- a/src/cn/edu/hrbcu/curriculum/pojo/Academy.java +++ b/src/cn/edu/hrbcu/curriculum/pojo/Academy.java @@ -7,6 +7,8 @@ public class Academy implements Serializable { private String name; + private Integer code; + private static final long serialVersionUID = 1L; public Long getId() { @@ -24,4 +26,12 @@ public class Academy implements Serializable { public void setName(String name) { this.name = name == null ? null : name.trim(); } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } } \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/pojo/AcademyExample.java b/src/cn/edu/hrbcu/curriculum/pojo/AcademyExample.java index e74df68..421c3c4 100644 --- a/src/cn/edu/hrbcu/curriculum/pojo/AcademyExample.java +++ b/src/cn/edu/hrbcu/curriculum/pojo/AcademyExample.java @@ -233,6 +233,66 @@ public class AcademyExample { addCriterion("name not between", value1, value2, "name"); return (Criteria) this; } + + public Criteria andCodeIsNull() { + addCriterion("code is null"); + return (Criteria) this; + } + + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); + return (Criteria) this; + } + + public Criteria andCodeEqualTo(Integer value) { + addCriterion("code =", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotEqualTo(Integer value) { + addCriterion("code <>", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThan(Integer value) { + addCriterion("code >", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThanOrEqualTo(Integer value) { + addCriterion("code >=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThan(Integer value) { + addCriterion("code <", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThanOrEqualTo(Integer value) { + addCriterion("code <=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeBetween(Integer value1, Integer value2) { + addCriterion("code between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotBetween(Integer value1, Integer value2) { + addCriterion("code not between", value1, value2, "code"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/src/cn/edu/hrbcu/curriculum/pojo/Coursetype.java b/src/cn/edu/hrbcu/curriculum/pojo/Coursetype.java index d95f072..735326d 100644 --- a/src/cn/edu/hrbcu/curriculum/pojo/Coursetype.java +++ b/src/cn/edu/hrbcu/curriculum/pojo/Coursetype.java @@ -7,6 +7,8 @@ public class Coursetype implements Serializable { private String name; + private String code; + private static final long serialVersionUID = 1L; public Long getId() { @@ -24,4 +26,12 @@ public class Coursetype implements Serializable { public void setName(String name) { this.name = name == null ? null : name.trim(); } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code == null ? null : code.trim(); + } } \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/pojo/CoursetypeExample.java b/src/cn/edu/hrbcu/curriculum/pojo/CoursetypeExample.java index 7a174f4..27500b6 100644 --- a/src/cn/edu/hrbcu/curriculum/pojo/CoursetypeExample.java +++ b/src/cn/edu/hrbcu/curriculum/pojo/CoursetypeExample.java @@ -233,6 +233,76 @@ public class CoursetypeExample { addCriterion("name not between", value1, value2, "name"); return (Criteria) this; } + + public Criteria andCodeIsNull() { + addCriterion("code is null"); + return (Criteria) this; + } + + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); + return (Criteria) this; + } + + public Criteria andCodeEqualTo(String value) { + addCriterion("code =", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotEqualTo(String value) { + addCriterion("code <>", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThan(String value) { + addCriterion("code >", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThanOrEqualTo(String value) { + addCriterion("code >=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThan(String value) { + addCriterion("code <", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThanOrEqualTo(String value) { + addCriterion("code <=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLike(String value) { + addCriterion("code like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotLike(String value) { + addCriterion("code not like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeBetween(String value1, String value2) { + addCriterion("code between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotBetween(String value1, String value2) { + addCriterion("code not between", value1, value2, "code"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/src/cn/edu/hrbcu/curriculum/pojo/Speciality.java b/src/cn/edu/hrbcu/curriculum/pojo/Speciality.java index 8849d54..b47f60d 100644 --- a/src/cn/edu/hrbcu/curriculum/pojo/Speciality.java +++ b/src/cn/edu/hrbcu/curriculum/pojo/Speciality.java @@ -9,6 +9,8 @@ public class Speciality implements Serializable { private Long tbuserid; + private Integer code; + private static final long serialVersionUID = 1L; public Long getId() { @@ -34,4 +36,12 @@ public class Speciality implements Serializable { public void setTbuserid(Long tbuserid) { this.tbuserid = tbuserid; } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } } \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/pojo/SpecialityExample.java b/src/cn/edu/hrbcu/curriculum/pojo/SpecialityExample.java index fcf097c..f81f893 100644 --- a/src/cn/edu/hrbcu/curriculum/pojo/SpecialityExample.java +++ b/src/cn/edu/hrbcu/curriculum/pojo/SpecialityExample.java @@ -293,6 +293,66 @@ public class SpecialityExample { addCriterion("tbuserid not between", value1, value2, "tbuserid"); return (Criteria) this; } + + public Criteria andCodeIsNull() { + addCriterion("code is null"); + return (Criteria) this; + } + + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); + return (Criteria) this; + } + + public Criteria andCodeEqualTo(Integer value) { + addCriterion("code =", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotEqualTo(Integer value) { + addCriterion("code <>", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThan(Integer value) { + addCriterion("code >", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThanOrEqualTo(Integer value) { + addCriterion("code >=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThan(Integer value) { + addCriterion("code <", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThanOrEqualTo(Integer value) { + addCriterion("code <=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeBetween(Integer value1, Integer value2) { + addCriterion("code between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotBetween(Integer value1, Integer value2) { + addCriterion("code not between", value1, value2, "code"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/src/cn/edu/hrbcu/curriculum/service/CourseService.java b/src/cn/edu/hrbcu/curriculum/service/CourseService.java index 4bdf853..3266308 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CourseService.java +++ b/src/cn/edu/hrbcu/curriculum/service/CourseService.java @@ -21,5 +21,7 @@ public interface CourseService { int updateCourse(Course course); void deleteCourse(Course course); + + Boolean makeCourseCode(int academyCode, int pecialityCode); } diff --git a/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java index b799969..c81c9f5 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java @@ -5,14 +5,18 @@ import org.springframework.stereotype.Service; import com.github.pagehelper.PageHelper; import java.util.List; import cn.edu.hrbcu.curriculum.dao.CourseMapper; +import cn.edu.hrbcu.curriculum.dao.CoursetypeMapper; import cn.edu.hrbcu.curriculum.pojo.Course; import cn.edu.hrbcu.curriculum.pojo.CourseExample; +import cn.edu.hrbcu.curriculum.pojo.Coursetype; import cn.edu.hrbcu.utils.Common; @Service public class CourseServiceImpl implements CourseService { @Autowired private CourseMapper courseMapper; + @Autowired + private CoursetypeService coursetypeService; public int insertCourse(Course course) { @@ -85,5 +89,35 @@ public class CourseServiceImpl implements CourseService { List list = courseMapper.selectByExample(example); return list; } + + + @Override + public Boolean makeCourseCode(int academyCode, 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){//只有自己的课程编号 + 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)); + } + } + } + } + return true; + } + return false; + } } diff --git a/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java b/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java index 0fe96bf..d108e5c 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java +++ b/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java @@ -14,6 +14,8 @@ public interface CurriculumService { Curriculum selectCurriculumById(Curriculum curriculum); List selectAllCurriculumBySpecialityandSemester(Long specialityid, int semester); + + List selectAllCurriculumBySpecialityandCourseType(Long specialityid, Long coursetypeId); List selectCurriculums(int currentPage); diff --git a/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java index b4733bb..8665a47 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import com.github.pagehelper.PageHelper; import cn.edu.hrbcu.curriculum.dao.CurriculumMapper; +import cn.edu.hrbcu.curriculum.pojo.Course; import cn.edu.hrbcu.curriculum.pojo.Curriculum; import cn.edu.hrbcu.curriculum.pojo.CurriculumExample; import cn.edu.hrbcu.utils.Common; @@ -28,6 +29,8 @@ import cn.edu.hrbcu.utils.Common; public class CurriculumServiceImpl implements CurriculumService{ @Autowired private CurriculumMapper curriculumMapper; + @Autowired + CourseService courseService; @Override public int insertCurriculum(Curriculum curriculum) { @@ -93,6 +96,7 @@ public class CurriculumServiceImpl implements CurriculumService{ curriculum_update.setStart(curriculum_all_new.getStart()); curriculum_update.setEnd(curriculum_all_new.getEnd()); curriculum_update.setHpw(curriculum_all_new.getHpw()); + curriculum_update.setAvailable(curriculum_all_new.getAvailable()); foundSame = true; break; } @@ -222,10 +226,29 @@ public class CurriculumServiceImpl implements CurriculumService{ List add_ids = new ArrayList(); add_ids.addAll(new_ids); add_ids.removeAll(exist_ids); - - System.out.println(remove_ids.get(0) + ":" + remove_ids.size()); - System.out.println(update_ids.get(0) + ":" + update_ids.size()); - System.out.println(add_ids.get(0) + ":" + add_ids.size()); + } + @Override + public List selectAllCurriculumBySpecialityandCourseType(Long specialityid, Long coursetypeId) { + List curriculums = new ArrayList(); + + List courseids_ = new ArrayList(); + Course c = new Course(); + c.setCoursetypeid(coursetypeId); + List courses_ = courseService.selectCourseBy(c); + for (Course course : courses_) { + courseids_.add(course.getId()); + } + + CurriculumExample example = new CurriculumExample(); + CurriculumExample.Criteria criteria = example.createCriteria(); + criteria.andSpecialityidEqualTo(specialityid); + + if(courseids_ != null && courseids_.size() > 0){ + criteria.andCourseidIn(courseids_); + curriculums = curriculumMapper.selectByExample(example); + } + + return curriculums; } } diff --git a/src/cn/edu/hrbcu/curriculum/service/TbUserService.java b/src/cn/edu/hrbcu/curriculum/service/TbUserService.java index 525a6a3..4aea5cd 100644 --- a/src/cn/edu/hrbcu/curriculum/service/TbUserService.java +++ b/src/cn/edu/hrbcu/curriculum/service/TbUserService.java @@ -5,7 +5,7 @@ import cn.edu.hrbcu.curriculum.pojo.TbUser; public interface TbUserService { - int insertUser(TbUser user); + Boolean insertUser(TbUser user); List selectUserByLoginname(String username); @@ -18,5 +18,7 @@ public interface TbUserService { List selectTbUsers(int currentPage); List selectAllUser(); + + boolean registerData(TbUser user); } diff --git a/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java index ec78cad..f5fd728 100644 --- a/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java @@ -1,7 +1,11 @@ package cn.edu.hrbcu.curriculum.service; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import org.apache.shiro.crypto.hash.SimpleHash; +import org.apache.shiro.util.ByteSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -11,6 +15,7 @@ import cn.edu.hrbcu.curriculum.dao.TbUserMapper; import cn.edu.hrbcu.curriculum.pojo.TbUser; import cn.edu.hrbcu.curriculum.pojo.TbUserExample; import cn.edu.hrbcu.utils.Common; +import cn.edu.hrbcu.utils.UuidUtil; @Service @@ -20,9 +25,9 @@ public class TbUserServiceImpl implements TbUserService{ TbUserMapper bUserMapper; @Override - public int insertUser(TbUser user) { + public Boolean insertUser(TbUser user) { // TODO Auto-generated method stub - return bUserMapper.insert(user); + return registerData(user); } @Override @@ -75,5 +80,32 @@ public class TbUserServiceImpl implements TbUserService{ } + @Override + public boolean registerData(TbUser user) { + // 生成uuid + String id = UuidUtil.get32UUID(); + + // 将用户名作为盐值 + ByteSource salt = ByteSource.Util.bytes(user.getLoginname()); + /* + * MD5加密： + * 使用SimpleHash类对原始密码进行加密。 + * 第一个参数代表使用MD5方式加密 + * 第二个参数为原始密码 + * 第三个参数为盐值，即用户名 + * 第四个参数为加密次数 + * 最后用toHex()方法将加密后的密码转成String + * */ + String newPs = new SimpleHash("MD5", user.getPassword(), salt, 1024).toHex(); + + user.setPassword(newPs); + // 看数据库中是否存在该账户 + List userInfo = selectUserByLoginname(user.getLoginname()); + if(userInfo == null || userInfo.size() == 0) { + bUserMapper.insert(user); + return true; + } + return false; + } } diff --git a/src/cn/edu/hrbcu/shiro/ShiroRealm.java b/src/cn/edu/hrbcu/shiro/ShiroRealm.java index 4ae45f5..c302bdb 100644 --- a/src/cn/edu/hrbcu/shiro/ShiroRealm.java +++ b/src/cn/edu/hrbcu/shiro/ShiroRealm.java @@ -26,7 +26,6 @@ public class ShiroRealm extends AuthenticatingRealm{ throws AuthenticationException { //1.强转 UsernamePasswordToken upToken = (UsernamePasswordToken) token; - //2.获取系统管理员账号 String username = upToken.getUsername(); diff --git a/src/cn/edu/hrbcu/utils/CharacterUtil.java b/src/cn/edu/hrbcu/utils/CharacterUtil.java new file mode 100644 index 0000000..3795b41 --- /dev/null +++ b/src/cn/edu/hrbcu/utils/CharacterUtil.java @@ -0,0 +1,12 @@ +package cn.edu.hrbcu.utils; + +public class CharacterUtil { + public static final String[] roman_char = { "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX"}; + + public static String num2roman(Integer num){ + if(num == null) + return ""; + + return roman_char[num - 1]; + } +} diff --git a/src/cn/edu/hrbcu/utils/UuidUtil.java b/src/cn/edu/hrbcu/utils/UuidUtil.java new file mode 100644 index 0000000..a1f8845 --- /dev/null +++ b/src/cn/edu/hrbcu/utils/UuidUtil.java @@ -0,0 +1,10 @@ +package cn.edu.hrbcu.utils; + +import java.util.UUID; + +public class UuidUtil { + public static String get32UUID() { + String uuid = UUID.randomUUID().toString().trim().replaceAll("-", ""); + return uuid; + } +} -- Gitee