更新Arrange字段desc为description

增加subtask表字段grade_code，实体类增加gradeCode

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

@@ -81,6 +81,11 @@ public class ScheduleDto extends IdEntity<ScheduleDto>{
     @NotBlank
     private String roomCode;
 
+    /*企业编号*/
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为64")
+    @NotBlank
+    private String agencyCode;
+
     @Transient
     private String roomName;
 

src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java

@@ -55,6 +55,7 @@ public class BArrangeServiceImpl implements BArrangeService {
     private BRoomsRepository bRoomsRepository;
 
 
+
     /**
     * 保存 bArrange
     * @param json
@@ -102,7 +103,9 @@ public class BArrangeServiceImpl implements BArrangeService {
     @Override
     public PersistModel importExcel(HSSFWorkbook hwb, String token) {
         ArrayList<ScheduleDto> scheduleDtos = new ArrayList<ScheduleDto>();
-
+        //获取用户ID
+        String userBusinessId = UserUtil.getAuthenBusinessId();
+        String agencyCode = sysUserMapper.queryAgencyCodeByBusinessId(userBusinessId);
 
         String[] headers = {"课程编号", "教师编号", "班级编号","教室编号","周次","周学时","周一",
                 "周二","周三","周四","周五","周六"};
@@ -181,6 +184,7 @@ public class BArrangeServiceImpl implements BArrangeService {
             scheduleDto.setThursday(value[9]);
             scheduleDto.setFriday(value[10]);
             scheduleDto.setSaturday(value[11]);
+            scheduleDto.setAgencyCode(agencyCode);
             scheduleDto.setCommonBusinessId();
             UserUtil.setCurrentPersistOperation(scheduleDto);
             scheduleDtos.add(scheduleDto);

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

@@ -79,4 +79,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             "<if test=\"agencyCode !=null and agencyCode != '' \">and su.agency_code = #{agencyCode} </if></script>")
     @ResultMap(value = "BaseResultMap")
     List<SysUser> queryCreatedUsers(SysUser sysUser);
+
+    @Select("<script>select agency_code from s_user where business_id = #{businessId}</script>")
+    String queryAgencyCodeByBusinessId(String businessId);
 }

src/main/resources/mapper/business/barrange/mapper/BArrangeMapper.xml

@@ -96,14 +96,14 @@
         <insert id="insertList">
                 insert into b_schedule_dto(business_id,flag,del_flag,update_by,create_by,create_date,update_date,remarks,
                 lesson_code,teacher_code,class_code,week,class_hour,
-                monday,tuesday,wednesday,thursday,friday,saturday,room_code)
+                monday,tuesday,wednesday,thursday,friday,saturday,room_code,agency_code)
                 values
                 <foreach collection="list" item="item" separator=",">
                         (#{item.businessId},#{item.flag},#{item.delFlag},#{item.updateBy},#{item.createBy},
                         #{item.createDate},#{item.updateDate},#{item.remarks},
                         #{item.lessonCode},#{item.teacherCode},#{item.classCode},
                         #{item.week},#{item.classHour},
-                        #{item.monday},#{item.tuesday},#{item.wednesday},#{item.thursday},#{item.friday},#{item.saturday},#{item.roomCode})
+                        #{item.monday},#{item.tuesday},#{item.wednesday},#{item.thursday},#{item.friday},#{item.saturday},#{item.roomCode},#{item.agencyCode})
                 </foreach>
         </insert>