Merge branch 'V2.0.3' of ssh://103.249.252.28:10022/lcy/education

# Conflicts:
#	src/main/java/org/rcisoft/core/result/ResultServiceEnums.java
#	src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

src/main/java/org/rcisoft/business/barrange/dao/BArrangeRepository.java

@@ -53,7 +53,7 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
     @Select("<script>select name,business_id,status from b_subtask where 1=1 "
             + "and del_flag = 0 "
             + "and flag = 1 "
-            + "and arrange_id = #{businessId} GROUP BY name"
+            + "and arrange_id = #{businessId} GROUP BY name order by create_date desc"
             + "</script>")
     @ResultMap(value = "bSubtaskResultMap")
     List<BSubtask> queryBSubtask(String businessId);

src/main/java/org/rcisoft/business/barrange/entity/BArrange.java

@@ -30,11 +30,12 @@ public class BArrange  extends IdEntity<BArrange> {
      private String termCode;
 
      /*描述*/
+     @Length(min = 1,max = 255,message = "长度最小为1,最大为250")
      private String description;
 
      /*状态*/
-     @Length(min = 1,max = 64,message = "长度为1")
-     @NotBlank
+//     @Length(min = 1,max = 2,message = "长度最小为1，最大为2")
+//     @NotBlank
      private String status;
 
      @Transient

src/main/java/org/rcisoft/business/barrange/entity/BSubtask.java

@@ -2,6 +2,8 @@ package org.rcisoft.business.barrange.entity;
 
 import lombok.*;
 
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.NotBlank;
 import org.rcisoft.core.entity.IdEntity;
 import javax.persistence.*;
 import java.math.BigDecimal;
@@ -24,6 +26,8 @@ public class BSubtask  extends IdEntity<BSubtask> {
 
      private String arrangeId;
 
+     @Length(min = 1 , max = 256 ,message = "长度最小为1，最大为250")
+     @NotBlank
      private String name;
 
      /**

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

@@ -22,6 +22,8 @@ import java.util.List;
 @Table(name = "b_rooms")
 public class BRooms  extends IdEntity<BRooms> {
 
+     private static final long serialVersionUID = -1981767442522112001L;
+
      /*教室类型*/
      @Length(min= 1 , max = 1, message = "长度为1")
      @NotBlank
@@ -38,7 +40,7 @@ public class BRooms  extends IdEntity<BRooms> {
      private String building;
 
      /*教室号*/
-     @Length(min= 1 , max = 64, message = "长度最短为1，最长为50")
+     @Length(min= 1 , max = 5, message = "长度最短为1，最长为5")
      @NotBlank
      private String classroomNo;
 

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -3,6 +3,8 @@ package org.rcisoft.sys.user.dao;
 
 import org.apache.ibatis.annotations.*;
 import org.rcisoft.business.bagency.entity.BAgency;
+import org.rcisoft.business.bcompany.entity.BCompany;
+import org.rcisoft.business.bteacher.entity.BTeacher;
 import org.rcisoft.core.base.BaseMapper;
 import org.rcisoft.sys.user.entity.SysUser;
 import org.rcisoft.sys.user.entity.UserRole;