|
@@ -18,6 +18,7 @@ import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
|
|
|
import com.zhongzheng.modules.course.service.ICourseProjectTypeService;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.Collection;
|
|
|
import java.util.Collections;
|
|
|
import java.util.List;
|
|
@@ -81,13 +82,18 @@ public class CourseProjectTypeServiceImpl extends ServiceImpl<CourseProjectTypeM
|
|
|
@Override
|
|
|
public Boolean updateByEditBo(CourseProjectTypeEditBo bo) {
|
|
|
CourseProjectType update = BeanUtil.toBean(bo, CourseProjectType.class);
|
|
|
- CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
|
|
|
- courseProjectTypeQueryBo.setProjectName(bo.getProjectName());
|
|
|
- courseProjectTypeQueryBo.setEducationId(bo.getEducationId());
|
|
|
- courseProjectTypeQueryBo.setId(bo.getId());
|
|
|
- Collection<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.queryList(courseProjectTypeQueryBo);
|
|
|
- if (CollectionUtils.isEmpty(courseProjectTypeVos)){
|
|
|
- validEntityBeforeSave(update);
|
|
|
+ if (bo.getStatus() != -1) {
|
|
|
+ CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
|
|
|
+ courseProjectTypeQueryBo.setProjectName(bo.getProjectName());
|
|
|
+ courseProjectTypeQueryBo.setEducationId(bo.getEducationId());
|
|
|
+ courseProjectTypeQueryBo.setId(bo.getId());
|
|
|
+ List<Integer> longs = new ArrayList<>();
|
|
|
+ longs.add(1);
|
|
|
+ courseProjectTypeQueryBo.setStatus(longs);
|
|
|
+ Collection<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.queryList(courseProjectTypeQueryBo);
|
|
|
+ if (CollectionUtils.isEmpty(courseProjectTypeVos)) {
|
|
|
+ validEntityBeforeSave(update);
|
|
|
+ }
|
|
|
}
|
|
|
update.setUpdateTime(DateUtils.getNowTime());
|
|
|
return this.updateById(update);
|
|
@@ -102,6 +108,9 @@ public class CourseProjectTypeServiceImpl extends ServiceImpl<CourseProjectTypeM
|
|
|
CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
|
|
|
courseProjectTypeQueryBo.setProjectName(entity.getProjectName());
|
|
|
courseProjectTypeQueryBo.setEducationId(entity.getEducationId());
|
|
|
+ List<Integer> longs = new ArrayList<>();
|
|
|
+ longs.add(1);
|
|
|
+ courseProjectTypeQueryBo.setStatus(longs);
|
|
|
Collection<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.queryList(courseProjectTypeQueryBo);
|
|
|
if (!CollectionUtils.isEmpty(courseProjectTypeVos)){
|
|
|
throw new RuntimeException("项目重复");
|