Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
education
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李丛阳
education
Commits
bdbaee4f
Commit
bdbaee4f
authored
Jul 21, 2020
by
liuyuanjun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug29524
parent
358635c5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
BChapterRepository.java
...org/rcisoft/business/bchapter/dao/BChapterRepository.java
+2
-5
BChapterServiceImpl.java
...t/business/bchapter/service/impl/BChapterServiceImpl.java
+1
-1
No files found.
src/main/java/org/rcisoft/business/bchapter/dao/BChapterRepository.java
View file @
bdbaee4f
...
...
@@ -88,10 +88,7 @@ public interface BChapterRepository extends BaseMapper<BChapter> {
" bf.file_name AS fileName ,"
+
" bf.file_time AS fileTime ,"
+
" bf.file_size AS fileSize ,"
+
" if((SELECT count(0) from b_file bbf\n"
+
" left join b_lesson bl on bl.business_id = bbf.lesson_id\n"
+
" where bbf.video_url = bf.video_url\n"
+
" and bl.corp_id != '###')>1,1,0) isCutPdf "
+
" if((SELECT count(0) from b_file bff where bff.video_url = bf.video_url and bff.lesson_id = #{lessonId}) isCutPdf "
+
" FROM "
+
" b_chapter bc "
+
" LEFT JOIN b_file bf ON bf.chapter_id = bc.business_id "
+
...
...
@@ -101,7 +98,7 @@ public interface BChapterRepository extends BaseMapper<BChapter> {
" ORDER BY "
+
" bc.sort asc</script>"
)
@ResultMap
(
value
=
"SupperChildListResultMap"
)
List
<
QueryChapterListResDTO
>
queryBChaptersByPid
(
String
pi
d
);
List
<
QueryChapterListResDTO
>
queryBChaptersByPid
(
@Param
(
"pid"
)
String
pid
,
@Param
(
"lessonId"
)
String
lessonI
d
);
/**
* 根据章节id查找该章节学生分数列表
...
...
src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java
View file @
bdbaee4f
...
...
@@ -719,7 +719,7 @@ public class BChapterServiceImpl implements BChapterService {
if
((
ReleaseStateEnum
.
RELEASED
.
getCode
().
equals
(
bLesson
.
getReleaseState
())
||
ReleaseStateEnum
.
CLOSED
.
getCode
().
equals
(
bLesson
.
getReleaseState
()))
&&
chapterCount
==
1
&&
bChapter
.
getChapterLevel
()
!=
1
)
{
throw
new
ServiceException
(
ResultServiceEnums
.
CHAPTER_ONLY_ONE
);
}
List
<
QueryChapterListResDTO
>
childList
=
bChapterRepository
.
queryBChaptersByPid
(
id
);
List
<
QueryChapterListResDTO
>
childList
=
bChapterRepository
.
queryBChaptersByPid
(
id
,
lessonId
);
boolean
hasChild
=
childList
!=
null
&&
childList
.
size
()
>
0
;
boolean
isChapter
=
bChapter
.
getChapterLevel
()
==
ChapterLevelEnum
.
CHAPTER
.
getCode
();
if
(
isChapter
&&
hasChild
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment