diff --git a/roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/controller/biz/BossCourseAuditBiz.java b/roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/controller/biz/BossCourseAuditBiz.java index bbd6ff7c581024fc40bc2729a21442e9f157be89..ee2daf25a976c326edafa33ae18f615a11ff6b4b 100644 --- a/roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/controller/biz/BossCourseAuditBiz.java +++ b/roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/controller/biz/BossCourseAuditBiz.java @@ -93,14 +93,16 @@ public class BossCourseAuditBiz extends BaseBiz { public Page listForPage(CourseAuditQO qo) { CourseAuditExample example = new CourseAuditExample(); Criteria c = example.createCriteria(); - c.andAuditStatusNotEqualTo(AuditStatusEnum.SUCCESS.getCode()); + if (!StringUtils.isEmpty(qo.getCourseName())) { c.andCourseNameLike(PageUtil.rightLike(qo.getCourseName())); } if (qo.getStatusId() != null) { c.andStatusIdEqualTo(qo.getStatusId()); } - if (qo.getAuditStatus() != null) { + if (qo.getAuditStatus() == null) { + c.andAuditStatusNotEqualTo(AuditStatusEnum.SUCCESS.getCode()); + } else { c.andAuditStatusEqualTo(qo.getAuditStatus()); } if (qo.getIsFree() != null) { @@ -109,9 +111,7 @@ public class BossCourseAuditBiz extends BaseBiz { if (qo.getIsPutaway() != null) { c.andIsPutawayEqualTo(qo.getIsPutaway()); } - if (qo.getAuditStatus() != null) { - c.andAuditStatusEqualTo(qo.getAuditStatus()); - } + example.setOrderByClause(" status_id desc, is_putaway desc, sort desc, id desc "); Page page = dao.listForPage(qo.getPageCurrent(), qo.getPageSize(), example); Page CourseAuditVOList = PageUtil.transform(page, CourseAuditVO.class); diff --git a/roncoo-education-web-boss/src/main/resources/templates/admin/sysRole/add.ftl b/roncoo-education-web-boss/src/main/resources/templates/admin/sysRole/add.ftl index 1c587f7d855413ed30a808f751b116aada84c4f5..c02ae86e1a097d6cd3ad10c1f3fba6b8ca7b4f66 100644 --- a/roncoo-education-web-boss/src/main/resources/templates/admin/sysRole/add.ftl +++ b/roncoo-education-web-boss/src/main/resources/templates/admin/sysRole/add.ftl @@ -3,7 +3,7 @@
- +
diff --git a/roncoo-education-web-boss/src/main/resources/templates/course/course/view.ftl b/roncoo-education-web-boss/src/main/resources/templates/course/course/view.ftl index 045e8f09d2ce56bda0d79050f5bfd435b8fa5dd4..d77e373f8b69d409110b413d2d93192d060bbf0d 100644 --- a/roncoo-education-web-boss/src/main/resources/templates/course/course/view.ftl +++ b/roncoo-education-web-boss/src/main/resources/templates/course/course/view.ftl @@ -41,11 +41,11 @@
<#list bean.courseChapterVOList! as chapter> - 【${chapter_index+1}】 ${chapter.chapterName!} -【<#if chapter.isFree!?string == '1'>免费<#if chapter.isFree!?string == '0'>${chapter.chapterOriginal!}元】 + 【${chapter_index+1}】 ${chapter.chapterName!}

<#list chapter.courseChapterPeriodVOList! as period> -     |--课时:${period.periodName!} -【<#if period.isFree! == 1>免费<#if period.isFree! == 0>${period.periodOriginal!}元】 +     |--课时:${period.periodName!}

diff --git a/roncoo-education-web-boss/src/main/resources/templates/course/courseAudit/view.ftl b/roncoo-education-web-boss/src/main/resources/templates/course/courseAudit/view.ftl index 929493b758842bbf0643ad5e00d099e2b4f90c10..8f37d63be594edb97a7999cc474ba25c74a21c5a 100644 --- a/roncoo-education-web-boss/src/main/resources/templates/course/courseAudit/view.ftl +++ b/roncoo-education-web-boss/src/main/resources/templates/course/courseAudit/view.ftl @@ -37,11 +37,11 @@
<#list bean.courseChapterAuditList! as chapter> - 【${chapter_index+1}】 ${chapter.chapterName!} -【<#if chapter.isFree!?string == '1'>免费<#if chapter.isFree!?string == '0'>${chapter.chapterOriginal!}元】 + 【${chapter_index+1}】 ${chapter.chapterName!}

<#list chapter.courseChapterPeriodAuditList! as period> -     |--课时:${period.periodName!} -【<#if period.isFree! == 1>免费<#if period.isFree! == 0>${period.periodOriginal!}元】 +     |--课时:${period.periodName!}

diff --git a/roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/add.ftl b/roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/add.ftl index fd3eb1ee735103f282a0dd5ae583889422bdd0c9..4a884ff61544ea59e205bf1a0a0c2080f98fd1ba 100644 --- a/roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/add.ftl +++ b/roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/add.ftl @@ -6,7 +6,7 @@
- +
diff --git a/roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/add2.ftl b/roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/add2.ftl index fd3eb1ee735103f282a0dd5ae583889422bdd0c9..4a884ff61544ea59e205bf1a0a0c2080f98fd1ba 100644 --- a/roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/add2.ftl +++ b/roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/add2.ftl @@ -6,7 +6,7 @@
- +
diff --git a/roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/edit.ftl b/roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/edit.ftl index 3c6f6f60f38fc1664469182e618fc2d88832cbe4..502c722261f733aa61aeed7b5fd964ee9813703f 100644 --- a/roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/edit.ftl +++ b/roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/edit.ftl @@ -4,7 +4,7 @@
- +
diff --git a/roncoo-education-web-boss/src/main/resources/templates/system/websiteNav/add.ftl b/roncoo-education-web-boss/src/main/resources/templates/system/websiteNav/add.ftl index f7f5358317b56005b0e5c868cdc6693267691775..8f4ec6e5d613cf4fc8f647218d97661752150f7e 100644 --- a/roncoo-education-web-boss/src/main/resources/templates/system/websiteNav/add.ftl +++ b/roncoo-education-web-boss/src/main/resources/templates/system/websiteNav/add.ftl @@ -4,7 +4,7 @@
- +