change 3 سال پیش
والد
کامیت
665c9f6caa

+ 33 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorExamineServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.course.domain.CourseEducationType;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -18,6 +19,7 @@ import com.zhongzheng.modules.course.vo.MajorExamineVo;
 import com.zhongzheng.modules.course.service.IMajorExamineService;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -70,6 +72,18 @@ public class MajorExamineServiceImpl extends ServiceImpl<MajorExamineMapper, Maj
 
     @Override
     public Boolean insertByAddBo(MajorExamineAddBo bo) {
+        //判断新增名字是否重复
+        LambdaQueryWrapper<MajorExamine> lqw = Wrappers.lambdaQuery();
+        List<Integer> status = new ArrayList<>();
+        status.add(1);
+        status.add(0);
+        lqw.eq(StrUtil.isNotBlank(bo.getExamineName()), MajorExamine::getExamineName, bo.getExamineName());
+        lqw.in( MajorExamine::getStatus, status);
+        List<MajorExamine> list = this.list(lqw);
+        if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(list)){
+            throw new IllegalArgumentException("考期名称重复");
+        }
+
         MajorExamine add = BeanUtil.toBean(bo, MajorExamine.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
@@ -80,6 +94,25 @@ public class MajorExamineServiceImpl extends ServiceImpl<MajorExamineMapper, Maj
 
     @Override
     public Boolean updateByEditBo(MajorExamineEditBo bo) {
+
+        //修改判断名字是否重复
+        LambdaQueryWrapper<MajorExamine> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getExamineName()), MajorExamine::getExamineName, bo.getExamineName());
+        lqw.eq(bo.getId()!= null, MajorExamine::getId, bo.getId());
+        List<MajorExamine> list = this.list(lqw);
+        if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(list)){
+            lqw.clear();
+            lqw.eq(StrUtil.isNotBlank(bo.getExamineName()), MajorExamine::getExamineName, bo.getExamineName());
+            List<Integer> status = new ArrayList<>();
+            status.add(1);
+            status.add(0);
+            lqw.in(bo.getStatus() != null, MajorExamine::getStatus, status);
+            List<MajorExamine> list1 = this.list(lqw);
+            if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(list1)){
+                throw new IllegalArgumentException("考期名称重复");
+            }
+        }
+
         MajorExamine update = BeanUtil.toBean(bo, MajorExamine.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());

+ 35 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorLabelServiceImpl.java

@@ -2,10 +2,13 @@ package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo;
+import com.zhongzheng.modules.course.domain.CourseEducationType;
 import com.zhongzheng.modules.course.domain.Major;
+import com.zhongzheng.modules.course.domain.MajorExamine;
 import com.zhongzheng.modules.course.mapper.MajorMapper;
 import com.zhongzheng.modules.course.service.IMajorService;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
@@ -96,6 +99,19 @@ public class MajorLabelServiceImpl extends ServiceImpl<MajorLabelMapper, MajorLa
 
     @Override
     public Boolean insertByAddBo(MajorLabelAddBo bo) {
+
+        //判断新增名字是否重复
+        LambdaQueryWrapper<MajorLabel> lqw = Wrappers.lambdaQuery();
+        List<Integer> status = new ArrayList<>();
+        status.add(1);
+        status.add(0);
+        lqw.eq(StrUtil.isNotBlank(bo.getLabelName()), MajorLabel::getLabelName, bo.getLabelName());
+        lqw.in( MajorLabel::getStatus, status);
+        List<MajorLabel> list = this.list(lqw);
+        if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(list)){
+            throw new IllegalArgumentException("标签名称重复");
+        }
+
         MajorLabel add = BeanUtil.toBean(bo, MajorLabel.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
@@ -106,6 +122,25 @@ public class MajorLabelServiceImpl extends ServiceImpl<MajorLabelMapper, MajorLa
 
     @Override
     public Boolean updateByEditBo(MajorLabelEditBo bo) {
+
+        //修改判断名字是否重复
+        LambdaQueryWrapper<MajorLabel> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getLabelName()), MajorLabel::getLabelName, bo.getLabelName());
+        lqw.eq(bo.getId()!= null, MajorLabel::getId, bo.getId());
+        List<MajorLabel> list = this.list(lqw);
+        if (CollectionUtils.isEmpty(list)){
+            lqw.clear();
+            lqw.eq(StrUtil.isNotBlank(bo.getLabelName()), MajorLabel::getLabelName, bo.getLabelName());
+            List<Integer> status = new ArrayList<>();
+            status.add(1);
+            status.add(0);
+            lqw.in(bo.getStatus() != null, MajorLabel::getStatus, status);
+            List<MajorLabel> list1 = this.list(lqw);
+            if (CollectionUtils.isNotEmpty(list1)){
+                throw new IllegalArgumentException("标签名称重复");
+            }
+        }
+
         MajorLabel update = BeanUtil.toBean(bo, MajorLabel.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());

+ 34 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/TeacherServiceImpl.java

@@ -2,9 +2,11 @@ package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.course.bo.TeacherProjectAddBo;
+import com.zhongzheng.modules.course.domain.MajorLabel;
 import com.zhongzheng.modules.course.domain.TeacherProject;
 import com.zhongzheng.modules.course.service.ITeacherProjectService;
 import com.zhongzheng.modules.course.vo.TeacherProjectVo;
@@ -104,6 +106,19 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
 
     @Override
     public Boolean insertByAddBo(TeacherAddBo bo) {
+
+        //判断新增名字是否重复
+        LambdaQueryWrapper<Teacher> lqw = Wrappers.lambdaQuery();
+        List<Integer> status = new ArrayList<>();
+        status.add(1);
+        status.add(0);
+        lqw.eq(StrUtil.isNotBlank(bo.getTeacherName()), Teacher::getTeacherName, bo.getTeacherName());
+        lqw.in( Teacher::getStatus, status);
+        List<Teacher> list = this.list(lqw);
+        if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(list)){
+            throw new IllegalArgumentException("标签名称重复");
+        }
+
         Teacher add = BeanUtil.toBean(bo, Teacher.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
@@ -124,6 +139,25 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
 
     @Override
     public Boolean updateByEditBo(TeacherEditBo bo) {
+
+        //修改判断名字是否重复
+        LambdaQueryWrapper<Teacher> lqwTeacher = Wrappers.lambdaQuery();
+        lqwTeacher.eq(StrUtil.isNotBlank(bo.getTeacherName()), Teacher::getTeacherName, bo.getTeacherName());
+        lqwTeacher.eq(bo.getTeacherId()!= null, Teacher::getTeacherId, bo.getTeacherId());
+        List<Teacher> list = this.list(lqwTeacher);
+        if (CollectionUtils.isEmpty(list)){
+            lqwTeacher.clear();
+            lqwTeacher.eq(StrUtil.isNotBlank(bo.getTeacherName()), Teacher::getTeacherName, bo.getTeacherName());
+            List<Integer> status = new ArrayList<>();
+            status.add(1);
+            status.add(0);
+            lqwTeacher.in(bo.getStatus() != null, Teacher::getStatus, status);
+            List<Teacher> list1 = this.list(lqwTeacher);
+            if (CollectionUtils.isNotEmpty(list1)){
+                throw new IllegalArgumentException("标签名称重复");
+            }
+        }
+
         Teacher update = BeanUtil.toBean(bo, Teacher.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());