|
@@ -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());
|