|
@@ -30,6 +30,7 @@ import com.zhongzheng.modules.grade.vo.ClassGradeUserVo;
|
|
|
import com.zhongzheng.modules.system.domain.SysConfig;
|
|
|
import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
|
|
|
import com.zhongzheng.modules.user.bo.UserUpdateQueryBo;
|
|
|
+import com.zhongzheng.modules.user.domain.SchoolProject;
|
|
|
import com.zhongzheng.modules.user.domain.UserUpdate;
|
|
|
import com.zhongzheng.modules.user.service.IUserStudyRecordService;
|
|
|
import com.zhongzheng.modules.user.service.IUserUpdateService;
|
|
@@ -131,6 +132,13 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
|
|
|
add.setCreateTime(DateUtils.getNowTime());
|
|
|
add.setUpdateTime(DateUtils.getNowTime());
|
|
|
add.setGradeCode(ServletUtils.getEncoded("BJ"));
|
|
|
+ LambdaQueryWrapper<ClassGrade> lqw = Wrappers.lambdaQuery();
|
|
|
+ lqw.eq(ClassGrade::getClassName, add.getClassName());
|
|
|
+ lqw.eq(ClassGrade::getStatus, 1);
|
|
|
+ List<ClassGrade> list = this.list(lqw);
|
|
|
+ if (CollectionUtils.isNotEmpty(list)){
|
|
|
+ throw new RuntimeException("班级名称不能重复");
|
|
|
+ }
|
|
|
boolean save = this.save(add);
|
|
|
if (bo.getClassGradeGoodsAddBos() != null){
|
|
|
for (Long classGradeGoodsAddBo : bo.getClassGradeGoodsAddBos()) {
|
|
@@ -163,6 +171,22 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
|
|
|
ClassGrade update = BeanUtil.toBean(bo, ClassGrade.class);
|
|
|
validEntityBeforeSave(update);
|
|
|
update.setUpdateTime(DateUtils.getNowTime());
|
|
|
+ if (bo.getStatus() != -1) {
|
|
|
+ LambdaQueryWrapper<ClassGrade> lqw = Wrappers.lambdaQuery();
|
|
|
+ lqw.eq(ClassGrade::getClassName, update.getClassName());
|
|
|
+ lqw.eq(ClassGrade::getStatus, 1);
|
|
|
+ lqw.eq(ClassGrade::getGradeId, update.getGradeId());
|
|
|
+ List<ClassGrade> list = this.list(lqw);
|
|
|
+ if (CollectionUtils.isEmpty(list)) {
|
|
|
+ lqw.clear();
|
|
|
+ lqw.eq(ClassGrade::getClassName, update.getClassName());
|
|
|
+ lqw.eq(ClassGrade::getStatus, 1);
|
|
|
+ List<ClassGrade> classList = this.list(lqw);
|
|
|
+ if (CollectionUtils.isNotEmpty(classList)){
|
|
|
+ throw new RuntimeException("班级名称不能重复");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
if (bo.getSysUserId() != null){
|
|
|
LambdaQueryWrapper<ClassGradeSys> lqw = new LambdaQueryWrapper<>();
|
|
|
lqw.like(ClassGradeSys::getGradeId,bo.getGradeId());
|