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

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

@@ -96,36 +96,40 @@ public class BArrangeController extends PaginationController<BArrange> {
     }
 
     @ApiOperation(value="excel导入", notes="excel导入排课信息")
-    @ApiImplicitParam(name = "importFile", value = "excel文件", required = true, dataType = "MultipartFile")
+    @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,String termCode) throws Exception {
+    public Result excelImport(MultipartFile importFile,String subAgencyId) throws Exception {
+        //将数据插入列表视图(b_schedule_dto)
         PersistModel data = bArrangeServiceImpl.importExcel(MultipartFile2HSSFWorkbookConverter.convert(importFile),getToken(),subAgencyId);
-        bSlScheduleServiceImpl.importFile(MultipartFile2HSSFWorkbookConverter.convert(importFile),getToken(),subAgencyId,termCode);
+        //将数据插入周视图(b_sl_schedule)
+        bSlScheduleServiceImpl.importFile(MultipartFile2HSSFWorkbookConverter.convert(importFile),getToken(),subAgencyId);
         return Result.builder(data,
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
                 data.getInfluenceReason());
     }
 
-    @ApiOperation(value="查看  集合", notes="查看单  集合")
+    @ApiOperation(value="按照subAgencyId查列表视图", notes="按照subAgencyId查列表视图")
+    @ApiImplicitParams({@ApiImplicitParam(name = "subAgencyId", value = "subAgencyId", required = true, dataType = "varchar")})
     @GetMapping(value = "/findDtoBybSubtaskId")
-    public Result findDtoBybSubtaskId(String bSubtaskId) {
+    public Result findDtoBybSubtaskId(String subAgencyId) {
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                bArrangeServiceImpl.queryDtoBySubtaskId(bSubtaskId));
+                bArrangeServiceImpl.queryDtoBySubAgencyId(subAgencyId));
     }
 
 
-    @ApiOperation(value="查看  集合", notes="查看单  集合")
-    @GetMapping(value = "/findDtoByMany")
-    public Result findDtoByMany(String agencyCode,String name,String termCode,String teacherCode) {
-        return Result.builder(new PersistModel(1),
-                MessageConstant.MESSAGE_ALERT_SUCCESS,
-                MessageConstant.MESSAGE_ALERT_ERROR,
-                bArrangeServiceImpl.queryDtoByMany(agencyCode, name, termCode,teacherCode));
-    }
+//    @ApiOperation(value="查看  集合", notes="查看单  集合")
+//    @GetMapping(value = "/findDtoByMany")
+//    public Result findDtoByMany(String agencyCode,String name,String termCode,String teacherCode) {
+//        return Result.builder(new PersistModel(1),
+//                MessageConstant.MESSAGE_ALERT_SUCCESS,
+//                MessageConstant.MESSAGE_ALERT_ERROR,
+//                bArrangeServiceImpl.queryDtoByMany(agencyCode, name, termCode,teacherCode));
+//    }
 
     @ApiOperation(value="排课审核通过后的开课接口", notes="排课审核通过后的开课接口")
     @GetMapping(value = "/changeArrangeToSl")

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

@@ -71,12 +71,12 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
     //-----------------------------------------------------------------------------------------------------------------
 
 
-    @Select("<script>select * from b_schedule_dto LEFT JOIN b_subtask on b_schedule_dto.subtask_id = b_subtask.business_id " +
-            "LEFT JOIN b_arrange on b_subtask.arrange_id = b_arrange.business_id where 1=1 " +
-            "and b_subtask.business_id = #{bSubtaskId}" +
-            "</script>")
-    @ResultMap(value = "scheduleDtoResultMap")
-    List<ScheduleDto> queryDtoByAgencySubtaskId(String bSubtaskId);
+//    @Select("<script>select * from b_schedule_dto LEFT JOIN b_sub_agency on b_schedule_dto.sub_agency_id = b_sub_agency.business_id " +
+//            "LEFT JOIN b_arrange on b_subtask.arrange_id = b_arrange.business_id where 1=1 " +
+//            "and b_subtask.business_id = #{bSubtaskId}" +
+//            "</script>")
+//    @ResultMap(value = "scheduleDtoResultMap")
+//    List<ScheduleDto> queryDtoByAgencySubtaskId(String bSubtaskId);
 
     @Select("<script>select * from b_schedule_dto where sub_agency_id = #{subAgencyId} GROUP BY lesson_code</script>")
     @ResultMap(value = "scheduleDtoResultMap")
@@ -112,5 +112,12 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
     @ResultMap(value = "BaseResultMapByAgencyCode")
     BArrange selectArrangeById(String businessId);
 
+    @Select("<script>select term_code from b_arrange "
+            + "left join b_subtask on b_subtask.arrange_id = b_arrange.business_id "
+            + "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);
 }
 

src/main/java/org/rcisoft/business/barrange/service/BArrangeService.java

@@ -46,7 +46,7 @@ public interface BArrangeService {
     PersistModel importExcel(HSSFWorkbook convert, String token , String subtaskId);
 
 
-    List<ScheduleDto> queryDtoBySubtaskId(String bSubtaskId);
+    List<ScheduleDto> queryDtoBySubAgencyId(String SubAgencyId);
 
 
     List<ScheduleDto> queryDtoByMany(String agencyCode,String name,String termCode,String teacherCode);

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

@@ -336,8 +336,8 @@ public class BArrangeServiceImpl implements BArrangeService {
     }
 
     @Override
-    public List<ScheduleDto> queryDtoBySubtaskId(String bSubtaskId) {
-        return bArrangeRepository.queryDtoByAgencySubtaskId(bSubtaskId);
+    public List<ScheduleDto> queryDtoBySubAgencyId(String SubAgencyId) {
+        return bArrangeRepository.queryDtoBySubAgencyId(SubAgencyId);
     }
 
     @Override

src/main/java/org/rcisoft/business/bslschedule/service/BSlScheduleService.java

@@ -51,7 +51,7 @@ public interface BSlScheduleService {
 
 
 
-    PersistModel importFile(HSSFWorkbook hwb, String token , String subAgencyId , String termCode);
+    PersistModel importFile(HSSFWorkbook hwb, String token , String subAgencyId);
 
     ScheduleResult queryMoreBSlSchedules(String week, String subAgencyId, String termCode);
 }

src/main/java/org/rcisoft/business/bslschedule/service/impl/BSlScheduleServiceImpl.java

@@ -2,6 +2,7 @@ package org.rcisoft.business.bslschedule.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.rcisoft.business.barrange.dao.BArrangeRepository;
 import org.rcisoft.business.barrange.entity.ScheduleDto;
 import org.rcisoft.business.bcoursecode.dao.BCourseCodeRepository;
 import org.rcisoft.business.bcoursecode.entity.BCourseCode;
@@ -53,6 +54,9 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
     @Autowired
     private BCourseCodeRepository bCourseCodeRepository;
 
+    @Autowired
+    private BArrangeRepository bArrangeRepository;
+
     private static Map<String,Date> timeMap;
 
     private static String termCode;
@@ -127,8 +131,8 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
     }
 
     @Override
-    public PersistModel importFile(HSSFWorkbook hwb, String token, String subAgencyId, String termCode1) {
-        termCode = termCode1;
+    public PersistModel importFile(HSSFWorkbook hwb, String token, String subAgencyId) {
+        termCode = bArrangeRepository.selectTermCodeByBSubtaskId(subAgencyId);
         BTerm bTerm = bTermRepository.queryBtermByCode(termCode).get(0);
         //获取时间集合
         timeMap = FindTime.findTime(bTerm.getStartDate(),bTerm.getEndDate());

src/main/java/org/rcisoft/sys/user/controller/SysUserController.java

@@ -110,4 +110,15 @@ public class SysUserController extends PaginationController<SysUser> {
                 id);
     }
 
+    @ApiOperation(value="停用/启用用户", notes="停用/启用用户")
+    @ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "varchar", paramType = "path")
+    @PostMapping(value = "/stopOrStart")
+    public Result stopOrStart(String businessId){
+        int line = userServiceImpl.stopOrStartUserByUserBusinessId(businessId);
+        return Result.builder(new PersistModel(line),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                businessId);
+    }
+
 }

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

@@ -89,4 +89,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     @Update("update s_user set flag =#{flag} where login_name = #{loginName} and del_flag = 0 and flag = 1")
     int stopOrStartUser(SysUser user);
+
+    @Update("update s_user set flag =#{flag} where business_id = #{businessId} ")
+    int stopOrStartUserByUserBusinessId(SysUser sysUser);
 }

src/main/java/org/rcisoft/sys/user/service/SysUserService.java

@@ -26,4 +26,6 @@ public interface SysUserService {
     List<SysUser> queryUsersByPagination(PageUtil pageUtil, SysUser sysUser);
 
     int removeUser(String id, String token);
+
+    int stopOrStartUserByUserBusinessId(String businessId);
 }

src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java

@@ -111,4 +111,12 @@ public class SysUserServiceImpl implements SysUserService {
 		}
 		return sysUserMapper.resetPassword(userCode,businessId,passwordEncoder.encode(global.getDEFAULT_PASSWORD()));
 	}
+
+	@Override
+	public int stopOrStartUserByUserBusinessId(String businessId){
+		SysUser sysUser = sysUserMapper.selectByPrimaryKey(businessId);
+		String status = sysUser.getFlag().equals("0") ? "1":"0";
+		sysUser.setFlag(status);
+		return sysUserMapper.stopOrStartUserByUserBusinessId(sysUser);
+	}
 }

src/main/resources/application-dev.yml

@@ -11,7 +11,7 @@ server:
 #    org.springframework.web: DEBUG
 
 druid:
-  url: jdbc:mysql://127.0.0.1:3306/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+  url: jdbc:mysql://192.168.1.125:13318/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
   username: root
   password: 123456
   initial-size: 1