Kaynağa Gözat

判断重复

change 4 yıl önce
ebeveyn
işleme
3552b41f35

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorServiceImpl.java

@@ -110,7 +110,7 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
         lqw.in( Major::getStatus, status);
         List<Major> list = this.list(lqw);
         if (CollectionUtils.isNotEmpty(list)){
-            throw new IllegalArgumentException("教育类型名称重复");
+            throw new IllegalArgumentException("专业名称重复");
         }
 
         Major add = BeanUtil.toBean(bo, Major.class);

+ 11 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamNumberServiceImpl.java

@@ -111,6 +111,7 @@ public class ExamNumberServiceImpl extends ServiceImpl<ExamNumberMapper, ExamNum
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         boolean save = this.save(add);
+        //添加考次商品
         for (Long goodsId : bo.getGoodsId()) {
             ExamNumberGoodsAddBo examNumberGoodsAddBo = new ExamNumberGoodsAddBo();
             examNumberGoodsAddBo.setGoodsId(goodsId);
@@ -131,10 +132,11 @@ public class ExamNumberServiceImpl extends ServiceImpl<ExamNumberMapper, ExamNum
         ExamNumber info = getOne(new LambdaQueryWrapper<ExamNumber>()
                 .eq(ExamNumber::getExamNumberId,bo.getExamNumberId())
                 .last("limit 1"));
+        //判断考次不能小于更改前
         if (null != bo.getExamNumber()  && info.getExamNumber() > bo.getExamNumber()){
             throw new IllegalArgumentException("考试次数不能小于更改前");
         }
-
+        //判断前培次数不能小于更改前
         if (null != bo.getDoNumber()  &&info.getDoNumber() > bo.getDoNumber()){
             throw new IllegalArgumentException("前培次数不能小于更改前");
         }
@@ -145,20 +147,23 @@ public class ExamNumberServiceImpl extends ServiceImpl<ExamNumberMapper, ExamNum
             if (!CollectionUtils.isEmpty(list)) {
                 for (ExamNumberGoods examNumberGoods : list) {
                     if (bo.getStatus() == -1) {
+                        //判断是否已启用考试安排
                         Integer apply = baseMapper.selectApply(examNumberGoods.getGoodsId());
                         if (apply > 0) {
                             throw new IllegalArgumentException("当前商品已启用考试安排,不可删除");
                         }
-
+                        //判断是否已启用前培安排
                         Integer applyBefore = baseMapper.selectApplyBefore(examNumberGoods.getGoodsId());
                         if (applyBefore > 0) {
                             throw new IllegalArgumentException("当前商品已启用前培安排,不可删除");
                         }
                     }
+                    //商品被调用启用了不可再启用
                     Integer integer = baseMapper.selectExam(examNumberGoods.getGoodsId(), update.getExamNumberId());
                     if (bo.getStatus() == 1 && integer > 0) {
                         throw new IllegalArgumentException("当前商品已启用考次配置,不可开启,请重新创建新的配置考试次数和前培次数商品");
                     }
+                    //商品被调用启用了考试安排不可关闭
                     if (bo.getStatus() == 0) {
                         Integer apply = baseMapper.selectApply(examNumberGoods.getGoodsId());
                         if (apply > 0) {
@@ -167,6 +172,7 @@ public class ExamNumberServiceImpl extends ServiceImpl<ExamNumberMapper, ExamNum
                     }
                 }
             }
+            //添加修改后的商品
             LambdaQueryWrapper<ExamNumberGoods> example = Wrappers.lambdaQuery();
             example.eq(ExamNumberGoods::getExamNumberId, bo.getExamNumberId());
             examNumberGoodsService.remove(example);
@@ -179,15 +185,18 @@ public class ExamNumberServiceImpl extends ServiceImpl<ExamNumberMapper, ExamNum
                 examNumberGoodsService.insertByAddBo(examNumberGoodsAddBo);
             }
         }
+
         LambdaQueryWrapper<ExamNumberGoods> example = Wrappers.lambdaQuery();
         example.eq(ExamNumberGoods::getExamNumberId, bo.getExamNumberId());
         List<ExamNumberGoods> list = examNumberGoodsService.list(example);
         if (bo.getStatus() == -1) {
             for (ExamNumberGoods examNumberGoods : list) {
+                //已启用考试安排不可删除
                 Integer apply = baseMapper.selectApply(examNumberGoods.getGoodsId());
                 if (apply > 0) {
                     throw new IllegalArgumentException("当前商品已启用考试安排,不可删除");
                 }
+                //已启用前培安排不可删除
                 Integer applyBefore = baseMapper.selectApplyBefore(examNumberGoods.getGoodsId());
                 if (applyBefore > 0) {
                     throw new IllegalArgumentException("当前商品已启用前培安排,不可删除");

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamSiteServiceImpl.java

@@ -71,6 +71,8 @@ public class ExamSiteServiceImpl extends ServiceImpl<ExamSiteMapper, ExamSite> i
 
     @Override
     public Boolean insertByAddBo(ExamSiteAddBo bo) {
+
+        //判断地点是否重复
         ExamSite add = BeanUtil.toBean(bo, ExamSite.class);
         LambdaQueryWrapper<ExamSite> lqw = Wrappers.lambdaQuery();
         lqw.eq(ExamSite::getSiteAddress, bo.getSiteAddress());
@@ -88,6 +90,8 @@ public class ExamSiteServiceImpl extends ServiceImpl<ExamSiteMapper, ExamSite> i
 
     @Override
     public Boolean updateByEditBo(ExamSiteEditBo bo) {
+
+        //判断地点是否重复
         ExamSite update = BeanUtil.toBean(bo, ExamSite.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());

+ 9 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -152,6 +152,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(ClassGradeAddBo bo) {
+        //去重
         ClassGrade add = BeanUtil.toBean(bo, ClassGrade.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
@@ -165,6 +166,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             throw new RuntimeException("班级名称不能重复");
         }
         boolean save = this.save(add);
+        //添加班级商品
         if (bo.getClassGradeGoodsAddBos() != null) {
             for (Long classGradeGoodsAddBo : bo.getClassGradeGoodsAddBos()) {
                 ClassGradeGoods classGradeGoods = new ClassGradeGoods();
@@ -175,6 +177,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 classGradeGoodsService.save(classGradeGoods);
             }
         }
+        //记录班主任
         if (bo.getSysUserId() != null) {
             ClassGradeSys classGradeSys = new ClassGradeSys();
             classGradeSys.setGradeId(add.getGradeId());
@@ -194,6 +197,8 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(ClassGradeEditBo bo) {
+
+        //判断班级是否重复
         ClassGrade update = BeanUtil.toBean(bo, ClassGrade.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
@@ -213,6 +218,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 }
             }
         }
+        //更改班主任
         if (bo.getSysUserId() != null) {
             LambdaQueryWrapper<ClassGradeSys> lqw = new LambdaQueryWrapper<>();
             lqw.like(ClassGradeSys::getGradeId, bo.getGradeId());
@@ -240,6 +246,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             }
         }
         ClassGradeVo classGradeVo = this.queryById(bo.getGradeId());
+        //开班发送短信
         if (update.getClassStatus() != null && update.getClassStatus().equals(1) && (classGradeVo.getClassStatus() == null || classGradeVo.getClassStatus().equals(0))) {
             sendClassSMS(classGradeVo);
         }
@@ -327,7 +334,9 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
 
     @Override
     public List<ClassGradeStudentVo> listGrade(ClassGradeUserQueryBo bo) {
+        //查找班级学员
         List<ClassGradeStudentVo> classGradeStudentVos = baseMapper.listGrade(bo);
+        //得到每个学员
         for (ClassGradeStudentVo classGradeStudentVo : classGradeStudentVos) {
             Long secLong = 0L;
             Long studyLong = 0L;