完善接口

sql/edu_update.sql

@@ -72,3 +72,9 @@ ALTER TABLE `s_user`
 /*学期表新建max_sl_code字段，排课转为开课时按照“学期+当前开课序号最大值”定义sl表的code字段*/
 ALTER TABLE `b_term`
   ADD COLUMN `max_sl_code`  int(8) NULL DEFAULT 0 COMMENT '当前开课序号最大值' AFTER `current`;
+
+/*开课表b_sl新建source字段 0系统导入   1排课生成*/
+ALTER TABLE `b_sl`
+  ADD COLUMN `source`  varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '来源  0系统导入   1排课生成' AFTER `audit_status`;
+
+

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

@@ -75,12 +75,9 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
     @ResultMap(value = "scheduleDtoResultMap")
     List<ScheduleDto> queryDtoByAgencySubtaskId(String bSubtaskId);
 
-    @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.agency_code = #{agencyCode}" +
-            "</script>")
+    @Select("<script>select * from b_schedule_dto where sub_agency_id = #{subAgencyId} GROUP BY lesson_code</script>")
     @ResultMap(value = "scheduleDtoResultMap")
-    List<ScheduleDto> queryDtoByAgencyCode(String agencyCode);
+    List<ScheduleDto> queryDtoBySubAgencyId(String subAgencyId);
 
     @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 " +
@@ -90,8 +87,11 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
     @ResultMap(value = "scheduleDtoResultMap")
     List<ScheduleDto> queryDtoByAgencyMany(String agencyCode,String name,String termCode,@Param("teacherCode") String teacherCode);
 
-    @Select("select status from b_sub_agency where subtask_id = #{subTaskId} and del_flag = 0 and flag = 1")
-    List<String> queryAgencyCode(String subTaskId);
+    @Select("select business_id from b_sub_agency where subtask_id = #{subTaskId} and del_flag = 0 and flag = 1")
+    List<String> querySubAgencyId(String subTaskId);
+
+    @Select("select DISTINCT(status) from b_sub_agency where subtask_id = #{subTaskId} and del_flag = 0 and flag = 1")
+    List<String> querySubTaskStatus(String subTaskId);
 
     int insertList(ArrayList<ScheduleDto> list);
 
@@ -99,5 +99,6 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
 
     int insertBSubAgency(List<BSubAgency> list);
 
+
 }
 

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

@@ -264,19 +264,20 @@ public class BArrangeServiceImpl implements BArrangeService {
     @Override
     public int changeArrangeToSl(String businessId, String subTaskId ,String termCode) {
         int result = 0;
-        List<String> subTaskStatus = new ArrayList<>();//bArrangeRepository.querySubTaskStatus();
+        List<String> subTaskStatus = bArrangeRepository.querySubTaskStatus(subTaskId);
         if(subTaskStatus.size()>1||subTaskStatus.get(0).equals("0")||subTaskStatus.get(0).equals("1")){
             //当前子任务下有教学单位未完成审核，不能进行开课
             throw new ServiceException(ResultServiceEnums.AGENCY_NOT_PASS);
         }
-        List<String> agencyCodes = bArrangeRepository.queryAgencyCode(subTaskId);
-        if(agencyCodes.size()<1){
+        List<String> subAgencyIds = bArrangeRepository.querySubAgencyId(subTaskId);
+        if(subAgencyIds.size()<1){
             //子任务下没有教学单位
             throw new ServiceException(ResultServiceEnums.NO_AGENCY_SUBMISSION);
         }
         List<BSl> sls = new ArrayList<>();
-        for(String agencyCode : agencyCodes){
-            List<ScheduleDto> schedules = bArrangeRepository.queryDtoByAgencyCode(agencyCode);
+        for(String subAgencyId : subAgencyIds){
+            //查询要开的课
+            List<ScheduleDto> schedules = bArrangeRepository.queryDtoBySubAgencyId(subAgencyId);
             for(ScheduleDto schedule : schedules){
                 BSl sl = new BSl();
                 BLesson bLesson = bLessonRepository.queryBLessonByCode(schedule.getLessonCode());
@@ -297,6 +298,7 @@ public class BArrangeServiceImpl implements BArrangeService {
                 sl.setAuditStatus("0");//审核状态
                 sl.setClassHour(bLesson.getClassHour());//课时
                 sl.setCredits(bLesson.getCredits());//学分
+                sl.setSource("1");
                 UserUtil.setCurrentPersistOperation(sl);
                 sls.add(sl);
                 bTermRepository.MaxSlCodeByTermCode(termCode);//将该学期的开课序号最大值+1
@@ -310,6 +312,7 @@ public class BArrangeServiceImpl implements BArrangeService {
                 //复制章节及文件目录
                 chapterService.addBslFormLesson(null,sl.getLessonCode(), sl.getBusinessId());
             }
+            //批量插入
             result =bSlRepository.insertList(sls);
         }
         return result;

src/main/java/org/rcisoft/business/bcompany/controller/BCompanyController.java

@@ -104,4 +104,16 @@ public class BCompanyController extends PaginationController<BCompany> {
                 bCompanyService.queryCompanys(param));
     }
 
+
+    @ApiOperation(value="停用/启用用户", notes="停用/启用用户")
+    @ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")
+    @PostMapping(value = "/stopOrStartUser")
+    public Result stopOrStartUser(String businessId) {
+        PersistModel data = bCompanyService.stopOrStartUser(businessId);
+        return Result.builder(data,
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                businessId);
+    }
+
 }

src/main/java/org/rcisoft/business/bcompany/dao/BCompanyRepository.java

@@ -22,7 +22,7 @@ public interface BCompanyRepository extends BaseMapper<BCompany>{
             "LEFT JOIN b_agency ba on ba.`code` = bc.agency_code \n" +
             "LEFT JOIN s_r_user_role ur ON su.business_id = ur.user_id\n" +
             "LEFT JOIN s_role sr on ur.role_id = sr.business_id\n" +
-            "where bc.del_flag != 1 and bc.flag = 1 and su.del_flag != 1 and su.flag = 1 "+
+            "where bc.del_flag != 1 and su.del_flag != 1 "+
             "<if test=\"name!=null and name != ''\">and su.`name` like CONCAT('%',#{name},'%') </if>"+
             "<if test=\"code!=null and code != ''\">and bc.`code` like CONCAT('%',#{code},'%') </if></script>")
     @ResultMap(value = "BaseResultMap" )

src/main/java/org/rcisoft/business/bcompany/service/BCompanyService.java

@@ -21,4 +21,6 @@ public interface BCompanyService {
     PersistModel removeBCompany(String businessId);
 
     List<BCompany> queryCompanys(BCompany param);
+
+    PersistModel stopOrStartUser(String businessId);
 }

src/main/java/org/rcisoft/business/bcompany/service/impl/BCompanyServiceImpl.java

@@ -102,4 +102,23 @@ public class BCompanyServiceImpl implements BCompanyService{
     public List<BCompany> queryCompanys(BCompany param) {
         return bCompanyRepository.queryCompanys(param);
     }
+
+    @Override
+    public PersistModel stopOrStartUser(String businessId) {
+        String status = "1";
+        BCompany nowStatus = bCompanyRepository.selectOne(new BCompany(businessId,"0","1"));
+        if(nowStatus.getFlag().equals("1")){
+            status="0";
+        }
+        BCompany company = new BCompany();
+        company.setBusinessId(businessId);
+        company.setFlag(status);
+
+        SysUser user = new SysUser();
+        user.setLoginName(nowStatus.getCode());
+        user.setFlag(status);
+        sysUserMapper.stopOrStartUser(user);
+        int line = bCompanyRepository.updateByPrimaryKeySelective(company);
+        return new PersistModel(line);
+    }
 }

src/main/java/org/rcisoft/business/bsl/entity/BSl.java

@@ -70,6 +70,8 @@ public class BSl extends IdEntity<BSl> {
     @NotBlank
     private String credits;//学分
 
+    private String source;//来源
+
     private String auditStatus;//审核状态 0:待发布,1审核中,2已发布,3已驳回
 
      @Transient

src/main/java/org/rcisoft/core/service/impl/AuthenticationServiceImpl.java

@@ -89,7 +89,9 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
         List<SysRole> role = sysRoleRepository.queryCodeByUsername(username);
         if(role.size()!=0){
-            if (userType.equals("1")&&!global.getAdminCode().equals(role.get(0).getCode())){//1代表请求后台,只有管理员能够访问
+            //判断用户有没有登陆运维平台的权限
+            int rolePeration = sysRoleRepository.queryRoleByRoleCode(role.get(0).getCode(),"19");//19代表的是“登录运维平台权限”的ID
+            if (userType.equals("1")&&rolePeration!=1){//1代表请求后台,只有管理员能够访问
                 throw new ServiceException(ResultServiceEnums.ROLE_ERROR);
             }else if(userType.equals("0")&&global.getAdminCode().equals(role.get(0).getCode())){//代表请求前台，教师和学生可以请求，管理员不可以
                 throw new ServiceException(ResultServiceEnums.ROLE_ERROR);

src/main/java/org/rcisoft/sys/role/dao/SysRoleRepository.java

@@ -188,4 +188,10 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
             + "</script>")
     @ResultMap(value = "BaseResultMap" )
     List<SysRole> queryRolesByName(SysRole sysRole);
+
+    @Select("SELECT COUNT(*) FROM s_menu sm \n" +
+            "LEFT JOIN s_role_menu rm ON sm.BUSINESS_ID = rm.MENU_ID\n" +
+            "LEFT JOIN s_role sr ON rm.ROLE_ID = sr.business_id\n" +
+            "WHERE sr.`code` = #{roleCode} AND sm.BUSINESS_ID = #{businessId}")
+    int queryRoleByRoleCode(@Param("roleCode") String roleCode, @Param("businessId") String businessId);
 }

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

@@ -87,4 +87,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @Select("select * from b_agency where code = #{agencyCode} and del_flag = 0 and flag = 1")
     List<BAgency> checkTeacherAgency(SysUser sysUser);
 
+    @Update("update s_user set flag =#{flag} where login_name = #{loginName} and del_flag = 0 and flag = 1")
+    int stopOrStartUser(SysUser user);
 }

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

@@ -79,6 +79,7 @@
                 <result column="saturday" jdbcType="VARCHAR" property="saturday"/>
                 <result column="room_code" jdbcType="VARCHAR" property="roomCode"/>
                 <result column="room_name" jdbcType="VARCHAR" property="roomName"/>
+                <result column="sub_agency_id" jdbcType="VARCHAR" property="subAgencyId"/>
         </resultMap>
 
         <resultMap id="BaseResultMap2" type="org.rcisoft.business.barrange.entity.BArrange">

src/main/resources/mapper/business/bsl/mapper/BSlMapper.xml

@@ -26,5 +26,6 @@
         <result column="class_hour" jdbcType="VARCHAR" property="classHour"/>
         <result column="credits" jdbcType="VARCHAR" property="credits"/>
         <result column="audit_status" jdbcType="VARCHAR" property="auditStatus"/>
+        <result column="source" jdbcType="VARCHAR" property="source"/>
     </resultMap>
 </mapper>
\ No newline at end of file