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

# Conflicts:
#	src/main/java/org/rcisoft/business/bopinion/service/impl/BOpinionServiceImpl.java

src/main/java/org/rcisoft/business/barrange/controller/BArrangeController.java

@@ -98,7 +98,6 @@ public class BArrangeController extends PaginationController<BArrange> {
     @ApiOperation(value="excel导入", notes="excel导入排课信息")
     @ApiImplicitParams({@ApiImplicitParam(name = "importFile", value = "excel文件", required = true, dataType = "MultipartFile"),
             @ApiImplicitParam(name = "subAgencyId", value = "b_sub_agency.business_id", required = true, dataType = "varchar")})
-    @PreAuthorize("hasRole('ROLE_1001')")
     @PostMapping(value = "excelImport")
     public Result excelImport(MultipartFile importFile,String subAgencyId) throws Exception {
         //将数据插入列表视图(b_schedule_dto)

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

@@ -117,7 +117,6 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
             + "left join b_sub_agency on b_sub_agency.subtask_id = b_subtask.business_id "
             + "where b_sub_agency.business_id =  #{bSubAgencyId} "
             + "</script>")
-    @ResultMap(value = "BaseResultMap")
     String selectTermCodeByBSubtaskId(String bSubAgencyId);
 
     @Select("<script>select *,b_term.`name` as term_name,b_subtask.`name` as subtask_name,b_sub_agency.`status` as sub_agency_status from b_sub_agency "

src/main/java/org/rcisoft/sys/excel/ExcelDownloadController.java

@@ -31,6 +31,7 @@ public class ExcelDownloadController {
     private static final String SL_FILE_NAME = "sl.xls";
     private static final String ROOM_FILE_NAME = "room.xls";
     private static final String BUSINESS_CLASS = "business-class.xls";
+    private static final String IMPORT_DTO = "import-dto.xls";
 
     @Autowired
     private Global global;
@@ -97,6 +98,9 @@ public class ExcelDownloadController {
             case "9":
                 name = BUSINESS_CLASS;
                 break;
+            case "10":
+                name = IMPORT_DTO;
+                break;
         }
         return name;
     }