diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 5cb5c879..873bcc5d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -414,7 +414,8 @@ public class CourseServiceImpl implements ICourseService { if (TempFilterConfig.Manager_CourseFile_ByOrgIds) { if (dto.getIsSystemAdmin() == null || !dto.getIsSystemAdmin()) { List finalStrings = strings; - if(dto.getIsCreateCourse()){ + log.info("dto为"+dto); + if(dto.getIsCreateCourse()!=null&&dto.getIsCreateCourse()){ listByFilters2.removeIf(e -> { //去掉未发布的课程 if (!e.getPublished() && seache.contains(e.getId()) && !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())) { @@ -466,10 +467,10 @@ public class CourseServiceImpl implements ICourseService { List noAudiences = getNoAudiences(dto); list.addAll(noAudiences); // //成长路径的课 - List grow = getGrow(dto); +// List grow = getGrow(dto); // //已报名的课 List enroll = getEnroll(dto); - list.addAll(grow); +// list.addAll(grow); list.addAll(enroll); list.addAll(list1); list.addAll(list2); @@ -480,7 +481,7 @@ public class CourseServiceImpl implements ICourseService { String sql = "SELECT DISTINCT\n" + "rt.course_id\n" + "FROM\n" + - "boe.student s INNER JOIN boe.router_task rt on s.pid=rt.router_id inner join boe_base.boe_course c on c.id=rt.course_id\n" + + "boe_new.student s INNER JOIN boe_new.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" + "\n" + "WHERE\n" + "\n" + @@ -503,7 +504,7 @@ public class CourseServiceImpl implements ICourseService { String sql = "SELECT DISTINCT\n" + "pt.course_id\n" + "FROM\n" + - "boe.student s INNER JOIN boe.project_task pt on s.pid=pt.project_id inner join boe_base.boe_course c on c.id=pt.course_id\n" + + "boe_new.student s INNER JOIN boe_new.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" + "\n" + "WHERE\n" + "\n" + @@ -544,9 +545,9 @@ public class CourseServiceImpl implements ICourseService { String sql = "SELECT\n" + "\tc.id \n" + "FROM\n" + - "\tboe_base.boe_course c \n" + + "\tboe_course c \n" + "WHERE\n" + - "\t NOT EXISTS ( SELECT 1 FROM boe_base.boe_course_crowd cc where cc.course_id = c.id ) \n" + + "\t NOT EXISTS ( SELECT 1 FROM boe_course_crowd cc where cc.course_id = c.id ) \n" + "\tAND c.deleted =0 \n"; List list = courseDao.sqlFindList(sql); List list1 = new ArrayList<>(); @@ -560,9 +561,9 @@ public class CourseServiceImpl implements ICourseService { String sql = "SELECT DISTINCT\n" + "\tc.id \n" + "FROM\n" + - "\tboe.student s\n" + - "\tINNER JOIN boe.grow_task gt ON s.pid = gt.grow_id\n" + - "\tINNER JOIN boe_base.boe_course c ON gt.course_id = c.id \n" + + "\tboe_new.student s\n" + + "\tINNER JOIN boe_new.grow_task gt ON s.pid = gt.grow_id\n" + + "\tINNER JOIN boe_course c ON gt.course_id = c.id \n" + "WHERE\n" + "\ts.type = 14 \n" + "\tAND gt.type = 1 \n" + @@ -582,8 +583,8 @@ public class CourseServiceImpl implements ICourseService { String sql = "SELECT DISTINCT\n" + "\tsc.course_id \n" + "FROM\n" + - "\tboe_base.boe_study_course sc\n" + - "\tINNER JOIN boe_base.boe_course c ON sc.course_id = c.id \n" + + "\tboe_study_course sc\n" + + "\tINNER JOIN boe_course c ON sc.course_id = c.id \n" + "WHERE\n" + "\tsc.aid = ?1 \n" + "\tAND c.deleted =0"; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java index d066b992..fc2cb528 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java @@ -1,5 +1,6 @@ package com.xboe.module.exam.entity; +import java.math.BigInteger; import java.time.LocalDateTime; import javax.persistence.Column; @@ -188,4 +189,8 @@ public class ExamTest extends BaseEntity { @Column(name = "ref_status") private Integer refStatus; + + + @Column(name = "deleted") + private BigInteger deleted; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java index 33d38cd8..e9330c2a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java @@ -95,7 +95,7 @@ public class ExamTestServiceImpl implements IExamTestService { @Override public Boolean has(String paperId) { - ExamTest et=examTestDao.findOne(FieldFilters.eq("paperId", paperId)); + ExamTest et=examTestDao.findOne(FieldFilters.eq("paperId", paperId),FieldFilters.eq("deleted", 0)); //String etId= (String)examTestDao.findField("id", FieldFilters.eq("paperId", paperId)); if(et==null){ return true;