Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education

src/main/java/org/rcisoft/business/brooms/controller/BRoomsController.java

@@ -52,7 +52,7 @@ public class BRoomsController extends FileController<BRooms> {
     @ApiImplicitParams({@ApiImplicitParam(name = "campus", value = "校区(1)", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "building", value = "教学楼(1-50)", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "category", value = "教室类型(1)", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "classroomNo", value = "教室号(1-5)", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "classroomNo", value = "教室号(1-10)", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "classroomName", value = "教室名(1-50)", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "classSeat", value = "座位数(1-5)", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "examSeat", value = "考试座位数(1-5)", required = false, dataType = "varchar"),

src/main/java/org/rcisoft/business/brooms/entity/BRooms.java

@@ -40,12 +40,12 @@ public class BRooms  extends IdEntity<BRooms> {
      private String building;
 
      /*教室号*/
-     @Length(min= 1 , max = 5, message = "长度最短为1，最长为5")
+     @Length(min= 1 , max = 10, message = "长度最短为1，最长为10")
      @NotBlank
      private String classroomNo;
 
      /*教室名*/
-     @Length(min= 1 , max = 64, message = "长度最短为1，最长为50")
+     @Length(min= 1 , max = 50, message = "长度最短为1，最长为50")
      private String classroomName;
 
      /*座位数*/
@@ -55,11 +55,11 @@ public class BRooms  extends IdEntity<BRooms> {
      private Integer examSeat;
 
      /*计划*/
-     @Length(min= 1 , max = 64, message = "长度最短为1，最长为50")
+     @Length(min= 1 , max = 50, message = "长度最短为1，最长为50")
      private String plan;
 
      /*教室编号*/
-     @Length(min= 1 , max = 64, message = "长度最短为1，最长为50")
+     @Length(min= 1 , max = 50, message = "长度最短为1，最长为50")
      @NotBlank
      private String code;
 

src/main/java/org/rcisoft/business/bslschedule/dao/BSlScheduleRepository.java

@@ -24,7 +24,7 @@ public interface BSlScheduleRepository extends BaseMapper<BSlSchedule> {
     @ResultMap(value = "BaseResultMap" )
     List<BSlSchedule> queryBSlSchedules(BSlSchedule bSlSchedule);
 
-    @Select("<script>select *, "
+    @Select("<script>select *, s_user.name as teacherName,"
             + "b_agency.name as agencyName,b_agency.code as agencyCode,b_agency.business_id as agencyId, \n"
             + "b_lesson.code as lessonCode,b_direction.name as directionName,b_direction.code as directionCode, \n"
             + "b_sl.code as bslCode,s_user.name as userName, \n"
@@ -60,12 +60,12 @@ public interface BSlScheduleRepository extends BaseMapper<BSlSchedule> {
     @Select("select count(*) from b_sl_schedule where room_code = ( select `code` from b_rooms where business_id = #{businessId})")
     int countThisRoomNum(String businessId);
 
-    @Select("select count(*) from b_sl_schedule bs" +
+    @Select("select count(*) from b_sl_schedule bs " +
             "left join b_teacher bt on bs.tea_code = bt.code " +
             "where bt.business_id = #{id}")
     int querySlScheduleByTeaCode(String id);
 
-    @Select("select count(*) from b_schedule_dto bs" +
+    @Select("select count(*) from b_schedule_dto bs " +
             "left join b_teacher bt on bs.teacher_code = bt.code " +
             "where bt.business_id = #{id}")
     int querySlScheduleDtoByTeaCode(String id);

src/main/java/org/rcisoft/business/bslschedule/entity/BSlSchedule.java

@@ -91,5 +91,8 @@ public class BSlSchedule  extends IdEntity<BSlSchedule> {
 
      @Transient
      private String bslCode;
+
+     @Transient
+     private String teacherName;
 }
 

src/main/java/org/rcisoft/business/bstudent/dao/BStudentRepository.java

@@ -33,7 +33,8 @@ public interface BStudentRepository extends BaseMapper<BStudent> {
             "LEFT JOIN b_grade bg ON b.grade_code = bg.`code`\n" +
             "where b.del_flag != 1 and b.flag = 1  "+
             "<if test=\"condition!=null and condition != ''\">and u.`name` like CONCAT('%',#{condition},'%') or b.`code` like CONCAT('%',#{condition},'%') </if>"+
-            "order by b.grade_code desc" +
+            //"order by b.grade_code desc" +
+            "order by b.create_date desc" +
             "</script>")
     @ResultMap(value = "BaseResultMap" )
     List<BStudent> queryBStudents(BStudent param);