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

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

@@ -24,8 +24,8 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
             + "LEFT JOIN b_sub_agency ON b_subtask.business_id = b_sub_agency.subtask_id "
             + "LEFT JOIN b_term ON b_term.code = b_arrange.term_code "
             + "where 1=1 and agency_code = #{agencyCode} "
-            + "<if test=\"delFlag !=null and delFlag != '' \">and del_flag = #{delFlag} </if> "
-            + "<if test=\"flag !=null and flag != '' \">and flag = #{flag} </if> "
+            + "<if test=\"delFlag !=null and delFlag != '' \">and b_arrange.del_flag = #{delFlag} </if> "
+            + "<if test=\"flag !=null and flag != '' \">and b_arrange.flag = #{flag} </if> "
             + "<if test=\"status !=null and status != '' \">and FIND_IN_SET(b_arrange.`status`,#{status}) </if> "
             + "GROUP BY b_arrange.business_id order by b_arrange.status,b_arrange.create_date desc "
             + "</script>")

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

@@ -741,14 +741,14 @@ public class BArrangeServiceImpl implements BArrangeService {
         }
 
         //查询此排课下是否还存在没有开课的子任务
-        int count = bSubtaskRepository.judgeSubtask(arrangeId);
+        //int count = bSubtaskRepository.judgeSubtask(arrangeId);
         //如果没有状态不为5的子任务，则设定此排课任务完成
-        if(count == 0){
+        /*if(count == 0){
             BArrange bArrange = new BArrange();
             bArrange.setBusinessId(arrangeId);
             bArrange.setStatus("3");
             bArrangeRepository.updateByPrimaryKeySelective(bArrange);
-        }
+        }*/
         return result;
     }
 

src/main/java/org/rcisoft/business/bclass/service/impl/BClassServiceImpl.java

@@ -62,9 +62,11 @@ public class BClassServiceImpl implements BClassService {
     @Override
     public PersistModel persist(BClass model, String token){
         int line = 0;
+        if (bClassRepository.selectOne(new BClass(null,model.getClassName())) != null)
+            throw new ServiceException(ResultServiceEnums.NAME_IS_EXISTS);
         if(model.getBusinessId()==null) {
-            if (bClassRepository.selectOne(new BClass(model.getCode())) != null)
-                throw new ServiceException(ResultServiceEnums.CLASS_EXISTS);
+            if (bClassRepository.selectOne(new BClass(model.getCode(),null)) != null)
+                throw new ServiceException(ResultServiceEnums.CODE_IS_EXISTS);
             UserUtil.setCurrentPersistOperation(model);
             line = bClassRepository.insertSelective(model);
         }else

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

@@ -66,12 +66,12 @@ public class BOpinionServiceImpl implements BOpinionService{
             BSubtask bSubtask = new BSubtask(subTaskId,"3");
             bSubtaskRepository.updateByPrimaryKeySelective(bSubtask);
             //查询该排课任务下所有子任务的状态
-//            String arrangeId = bSubtaskRepository.queryArrangeIdById(subTaskId);
-//            List<String> subTaskStatus = bSubtaskRepository.querySubTaskStatusById(arrangeId);
-//            if(subTaskStatus.size()==1&&subTaskStatus.get(0).equals("3")){//审核全部通过，将排课任务状态置为完成
-//                BArrange bArrange = new BArrange(arrangeId,"3");
-//                bArrangeRepository.updateByPrimaryKeySelective(bArrange);
-//            }
+            String arrangeId = bSubtaskRepository.queryArrangeIdById(subTaskId);
+            List<String> subTaskStatus = bSubtaskRepository.querySubTaskStatusById(arrangeId);
+            if(subTaskStatus.size()==1&&subTaskStatus.get(0).equals("3")){//审核全部通过，将排课任务状态置为完成
+                BArrange bArrange = new BArrange(arrangeId,"3");
+                bArrangeRepository.updateByPrimaryKeySelective(bArrange);
+            }
         }
         return new PersistModel(line);
     }

src/main/java/org/rcisoft/business/bstudent/controller/BStudentController.java

@@ -48,6 +48,7 @@ public class BStudentController extends PaginationController<BStudent> {
             @ApiImplicitParam(name = "recommendOrder", value = "推荐排序", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "recommendCourse", value = "推荐原因(1-200)", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "gradeCode", value = "年级(1-64)", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "name", value = "姓名（1-15）", required = false, dataType = "varchar")})
 @PreAuthorize("hasRole('ROLE_1001')")
     @PostMapping(value = "/add")

src/main/java/org/rcisoft/business/bstudent/service/impl/BStudentServiceImpl.java

@@ -126,7 +126,8 @@ public class BStudentServiceImpl implements BStudentService {
 
         ArrayList<SysUser> users = new ArrayList<SysUser>();
         ArrayList<UserRole> userRoles = new ArrayList<UserRole>();
-        String[] headers = {"学号", "学生姓名", "性别","年级"};
+        List<String> valuesIncomplete = new ArrayList<>();
+        String[] headers = {"学号", "学生姓名", "性别","年级","备注"};
         ArrayList<String[]> values = ExcelUtil.importExcel(hwb, headers,true,1);  //获取excel数据
         
         if (values.size()<=0){
@@ -139,6 +140,7 @@ public class BStudentServiceImpl implements BStudentService {
         List<String> valuesEmailExist = new ArrayList<>();
         List<String> valuesGrade = new ArrayList<>();
 
+        int i = 1;
         for (String[] value : values) {
 
             String stuCode = value[0];
@@ -178,6 +180,11 @@ public class BStudentServiceImpl implements BStudentService {
                 continue;
             }
 
+            if(value[0].equals("")||value[1].equals("")||value[2].equals("")||value[3].equals("")){
+                valuesIncomplete.add(String.valueOf(i));
+                continue;
+            }
+
             //合法:通过了三次判断，证明可建立该用户
             valuesOK.add(value);
             //为合法的用户建立Gitlab账户，并批量存储Student、User和UserRole;
@@ -211,12 +218,14 @@ public class BStudentServiceImpl implements BStudentService {
             //创建完Gitlab账户后，将完整的User信息和UserRole计入users和userRoles中等待插入数据库
             BStudent bStudent = new BStudent(value[0]);
             bStudent.setGradeCode(value[3]);
+            bStudent.setRemarks(value[4]);
             UserUtil.setCurrentPersistOperation(bStudent);
             if (!students.contains(bStudent)) {
                 students.add(bStudent);
                 users.add(user);
                 userRoles.add(userRole);
             }
+            i++;
         }
 
 
@@ -244,6 +253,9 @@ public class BStudentServiceImpl implements BStudentService {
         if(valuesGrade.size()>0){
             result+="以下学年不存在："+ JSON.toJSONString(valuesGrade)+"。";
         }
+        if(valuesIncomplete.size()>0){
+            result+="第"+ JSON.toJSONString(valuesIncomplete)+"行数据不完整";
+        }
 
 
         if (valuesOK.size()<1){

src/main/java/org/rcisoft/business/bteacher/service/impl/BTeacherServiceImpl.java

@@ -82,7 +82,7 @@ public class BTeacherServiceImpl implements BTeacherService {
 
 
         ArrayList<UserRole> userRoles = new ArrayList<UserRole>();
-        String[] headers = {"教师工号", "教师姓名", "性别","教学单位编号"};
+        String[] headers = {"教师工号", "教师姓名", "性别","教学单位编号","备注"};
         ArrayList<String[]> values = ExcelUtil.importExcel(hwb, headers,true,1);  //获取excel数据
         if (values.size() == 0){
             throw new ServiceException(ResultServiceEnums.EXCEL_IMPORT_DATA_NOT_EXIST);
@@ -169,6 +169,7 @@ public class BTeacherServiceImpl implements BTeacherService {
 
             //创建完Gitlab账户后，将完整的User信息和UserRole计入users和userRoles中等待插入数据库
             BTeacher bTeacher= new BTeacher(value[0],value[3]);
+            bTeacher.setRemarks(value[4]);
             UserUtil.setCurrentPersistOperation(bTeacher);
             if (!teachers.contains(bTeacher)) {
                 teachers.add(bTeacher);

src/main/java/org/rcisoft/business/bterm/dao/BTermRepository.java

@@ -22,7 +22,7 @@ public interface BTermRepository extends BaseMapper<BTerm> {
     * @param param
     * @return
     */
-    @Select("<script>select * from b_term where del_flag != 1 and flag = 1</script>")
+    @Select("<script>select * from b_term where del_flag != 1 and flag = 1 ORDER BY start_date DESC</script>")
     @ResultMap(value = "BaseResultMap" )
     List<BTerm> queryBTerms(Map<String, Object> param);
 
@@ -39,7 +39,7 @@ public interface BTermRepository extends BaseMapper<BTerm> {
             "UNION " +
             "select * from b_term " +
             "where del_flag != 1 and flag = 1 and is_start = 1 " +
-            "order by current desc</script>")
+            "order by current desc,start_date DESC</script>")
     @ResultMap(value = "BaseResultMap" )
     List<BTerm> queryBTermList(String nowTime);
 

src/main/java/org/rcisoft/core/result/ResultServiceEnums.java

@@ -184,6 +184,8 @@ public enum ResultServiceEnums {
 
     ROOM_HAS_USED(98,"当前教室正在被使用，不可删除"),
 
+    NAME_IS_EXISTS(99,"名称重复"),
+
     DATA_HAS_USED(100,"当前数据被使用，不可删除"),
     ;