瀏覽代碼

商品更新下架

change 4 年之前
父節點
當前提交
b15796bc52

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseProjectTypeServiceImpl.java

@@ -82,6 +82,7 @@ public class CourseProjectTypeServiceImpl extends ServiceImpl<CourseProjectTypeM
     @Override
     public Boolean updateByEditBo(CourseProjectTypeEditBo bo) {
         CourseProjectType update = BeanUtil.toBean(bo, CourseProjectType.class);
+        //判断是否有重复命名
         if (bo.getStatus() != -1) {
             CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
             courseProjectTypeQueryBo.setProjectName(bo.getProjectName());
@@ -89,6 +90,7 @@ public class CourseProjectTypeServiceImpl extends ServiceImpl<CourseProjectTypeM
             courseProjectTypeQueryBo.setId(bo.getId());
             List<Integer> longs = new ArrayList<>();
             longs.add(1);
+            longs.add(0);
             courseProjectTypeQueryBo.setStatus(longs);
             Collection<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.queryList(courseProjectTypeQueryBo);
             if (CollectionUtils.isEmpty(courseProjectTypeVos)) {
@@ -110,6 +112,7 @@ public class CourseProjectTypeServiceImpl extends ServiceImpl<CourseProjectTypeM
         courseProjectTypeQueryBo.setEducationId(entity.getEducationId());
         List<Integer> longs = new ArrayList<>();
         longs.add(1);
+        longs.add(0);
         courseProjectTypeQueryBo.setStatus(longs);
         Collection<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.queryList(courseProjectTypeQueryBo);
         if (!CollectionUtils.isEmpty(courseProjectTypeVos)){

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSubjectServiceImpl.java

@@ -88,10 +88,12 @@ public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, C
 
     @Override
     public Boolean insertByAddBo(CourseSubjectAddBo bo) {
+        //查询是否重复的名字
         CourseSubjectQueryBo courseSubjectQueryBo = new CourseSubjectQueryBo();
         courseSubjectQueryBo.setSubjectName(bo.getSubjectName());
         List<Integer> status = new ArrayList<>();
         status.add(1);
+        status.add(0);
         courseSubjectQueryBo.setStatus(status);
         Collection<CourseSubjectVo> courseSubjectVos = baseMapper.queryList(courseSubjectQueryBo);
         if (CollectionUtils.isNotEmpty(courseSubjectVos)){
@@ -114,6 +116,7 @@ public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, C
 
     @Override
     public Boolean updateByEditBo(CourseSubjectEditBo bo) {
+        //查询是否重复的名字
         CourseSubjectQueryBo courseSubjectQueryBo = new CourseSubjectQueryBo();
         courseSubjectQueryBo.setSubjectName(bo.getSubjectName());
         courseSubjectQueryBo.setId(bo.getId());
@@ -136,6 +139,7 @@ public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, C
             LambdaQueryWrapper<CourseSubjectProject> lqw = Wrappers.lambdaQuery();
             lqw.eq(bo.getId() != null, CourseSubjectProject::getSubjectId, bo.getId());
             courseSubjectProjectService.remove(lqw);
+            //更改绑定的项目类型
             for (Long projectId : bo.getCourseSubjectProjects()) {
                 CourseSubjectProjectAddBo courseSubjectProjectAddBo = new CourseSubjectProjectAddBo();
                 courseSubjectProjectAddBo.setProjectId(projectId);

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

@@ -109,6 +109,7 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
         add.setUpdateTime(DateUtils.getNowTime());
         add.setEncoder(ServletUtils.getEncoded("ZY"));
         boolean save = this.save(add);
+        //新增项目类型
         for (Long schoolProject : bo.getMajorProjects()) {
             MajorProjectAddBo majorProjectAddBo = new MajorProjectAddBo();
             majorProjectAddBo.setProjectId(schoolProject);
@@ -127,6 +128,7 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
             LambdaQueryWrapper<MajorProject> lqw = Wrappers.lambdaQuery();
             lqw.eq(bo.getId() != null, MajorProject::getMajorId, bo.getId());
             majorProjectService.remove(lqw);
+            //修改项目类型
             for (Long schoolProject : bo.getMajorProjects()) {
                 MajorProjectAddBo majorProjectAddBo = new MajorProjectAddBo();
                 majorProjectAddBo.setProjectId(schoolProject);

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

@@ -110,6 +110,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
         add.setUpdateTime(DateUtils.getNowTime());
         add.setEncoder(ServletUtils.getEncoded("MK"));
         boolean save = this.save(add);
+        //添加教师绑定项目
         for (Long id : bo.getTeacherProjects()) {
             TeacherProjectAddBo teacherProjectAddBo = new TeacherProjectAddBo();
             teacherProjectAddBo.setTeacherId(add.getTeacherId());
@@ -130,6 +131,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
             LambdaQueryWrapper<TeacherProject> lqw = Wrappers.lambdaQuery();
             lqw.eq(TeacherProject::getTeacherId, update.getTeacherId());
             teacherProjectService.remove(lqw);
+            //添加教师绑定项目
             for (Long id : bo.getTeacherProjects()) {
                 TeacherProjectAddBo teacherProjectAddBo = new TeacherProjectAddBo();
                 teacherProjectAddBo.setTeacherId(update.getTeacherId());

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -332,7 +332,7 @@
             g.goods_id,
             g.goods_name,
             g.`year`,
-            (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.goods_id = g.goods_id AND ups.period_status =1 and ups.`status` =0 or ups.`status` =3 and up.grade_id = cgu.grade_id) as rebuild,
+            (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.goods_id = g.goods_id AND ups.period_status =1  and ups.`status` =3 and up.grade_id = cgu.grade_id) as rebuild,
             (case WHEN (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.goods_id = g.goods_id AND ups.period_status =1 and ups.`status` =0) >0 then 0 ELSE 1 end) as rebuild_status,
             cgu.grade_id,
             (SELECT COUNT(m.id) FROM course_menu_exam m LEFT JOIN goods_course c on m.course_id=c.course_id LEFT JOIN class_grade_goods cgg on cgg.goods_id = c.goods_id where cg.grade_id=cgg.grade_id and m.type = 1 ) as exam_num,