Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/GradeServiceImpl.java

@@ -161,6 +161,9 @@ public class GradeServiceImpl implements GradeService{
         sysGrade.setSchool_id(school_id);
         sysGrade.setGrade_no(no);
         sysGrade.setGrade_name(grade);
+        if(sysGradeMapper.count(grade,school_id)>0){
+            throw new BizException(BizExceptionCode.REPEAT_GRADE_NAME);
+        }
         sysGradeMapper.insertGrade(sysGrade);
         return new DocBaseDTO(sysGrade.getGrade_id());
     }
@@ -171,6 +174,9 @@ public class GradeServiceImpl implements GradeService{
             throw new BizException(BizExceptionCode.USELESS_DATA);
         }
         sysClazz.setClazz_status(1);
+        if(sysGradeMapper.countClazz(sysClazz.getClazz_name())>0){
+            throw new BizException(BizExceptionCode.REPEAT_CLASS_NAME);
+        }
         sysClazzMapper.insertSelective(sysClazz);
         return new DocBaseDTO(sysClazz.getClazz_id());
     }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/exception/BizExceptionCode.java

@@ -22,7 +22,9 @@ public enum BizExceptionCode implements BaseExceptionCode {
     EXISTS_TEACHER_CLASS(500006,"存在任课班级,无法删除"),
     EXISTS_SUBJECT_TEACHER(5000012, "该课程存在班级与任课教师,禁止删除"),
     EXISTS_SCORE_PUBLISH(5000013, "存在已发布成绩,禁止删除"),
-    EXISTS_CLASS(500011, "存在班级,无法删除");
+    EXISTS_CLASS(500011, "存在班级,无法删除"),
+    REPEAT_GRADE_NAME(600001, "年级名称重复"),
+    REPEAT_CLASS_NAME(600002, "班级名称重复");
 
 
     private int code;

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/mapper/SysGradeMapper.java

@@ -29,4 +29,8 @@ public interface SysGradeMapper {
     List<SysGrade> selectByGrade(@Param("condition") String condition, @Param("school_id") Long schoolId);
 
     Integer checkClass(Long id);
+
+    int count(@Param("grade_name") String grade_name, @Param("school_id") Long school_id);
+
+    int countClazz(@Param("clazz_name") String clazz_name);
 }

applications/school/school-server/src/main/resources/mapper/SysGradeMapper.xml

@@ -129,4 +129,25 @@
     select count(1) from sys_clazz where grade_id=#{id}
   </select>
 
+  <select id="count" resultType="int">
+    select count(*) from sys_grade
+    <where>
+      <if test="grade_name != null">
+        grade_name = #{grade_name}
+      </if>
+      <if test="school_id != null">
+        and school_id=#{school_id}
+      </if>
+    </where>
+  </select>
+
+  <select id="countClazz" resultType="int">
+    select count(*) from sys_grade
+    <where>
+      <if test="clazz_name != null">
+        clazz_name = #{clazz_name}
+      </if>
+    </where>
+  </select>
+
 </mapper>