Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
涂亚平
/
subsidy
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit c55137bd
authored
Dec 12, 2022
by
涂亚平
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导出bug修复
1 parent
ae243f73
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
8 deletions
src/main/java/com/subsidy/service/impl/LiveClassesServiceImpl.java
src/main/java/com/subsidy/service/impl/LiveDictServiceImpl.java
src/main/java/com/subsidy/service/impl/LivePlaybackHistoryServiceImpl.java
src/main/resources/mapper/LiveDictMapper.xml
src/main/java/com/subsidy/service/impl/LiveClassesServiceImpl.java
View file @
c55137b
...
...
@@ -121,6 +121,7 @@ public class LiveClassesServiceImpl extends ServiceImpl<LiveClassesMapper, LiveC
Page
pager
=
new
Page
(
1
,
-
1
);
IPage
iPage
=
this
.
baseMapper
.
classMembers
(
pager
,
classMembersDTO
.
getLiveId
(),
classMembersDTO
.
getClassId
(),
classMembersDTO
.
getUserName
());
List
<
ExportClassMembersVO
>
exportClassMembersVOS
=
new
ArrayList
<
ExportClassMembersVO
>();
List
<
ClassMembersVO
>
classMembersVOS
=
iPage
.
getRecords
();
for
(
ClassMembersVO
classMembersVO
:
classMembersVOS
)
{
...
...
@@ -180,12 +181,13 @@ public class LiveClassesServiceImpl extends ServiceImpl<LiveClassesMapper, LiveC
exportClassMembersVO
.
setIpAddress
(
changeListToString
(
ipAddress
));
exportClassMembersVO
.
setTerminals
(
changeListToString
(
terminals
));
if
(
liveStudyHistoryDOS
.
size
()
>
0
)
{
c
lassMembersVO
.
setSignInCounts
(
1
);
exportC
lassMembersVO
.
setSignInCounts
(
1
);
}
else
{
c
lassMembersVO
.
setSignInCounts
(
0
);
exportC
lassMembersVO
.
setSignInCounts
(
0
);
}
exportClassMembersVOS
.
add
(
exportClassMembersVO
);
}
return
iPage
.
getRecords
()
;
return
exportClassMembersVOS
;
}
public
DataViewVO
dataView
(
DataViewDTO
dataViewDTO
)
{
...
...
src/main/java/com/subsidy/service/impl/LiveDictServiceImpl.java
View file @
c55137b
...
...
@@ -122,7 +122,7 @@ public class LiveDictServiceImpl extends ServiceImpl<LiveDictMapper, LiveDictDO>
if
(
null
!=
ids
)
{
//
找到该测评已有的学生
//
List
<
Long
>
oldIds
=
this
.
baseMapper
.
liveClassesIds
(
addLiveDTO
.
getId
());
List
<
Long
>
newIds
=
addLiveDTO
.
getIds
();
...
...
@@ -131,7 +131,7 @@ public class LiveDictServiceImpl extends ServiceImpl<LiveDictMapper, LiveDictDO>
newStudentIds2
.
add
(
lg
);
}
newIds
.
removeAll
(
oldIds
);
//
新增的人在newStudentIds里
newIds
.
removeAll
(
oldIds
);
//
if
(
newIds
.
size
()
>
0
)
{
for
(
Long
lg
:
newIds
)
{
LiveClassesDO
liveClassesDO
=
new
LiveClassesDO
();
...
...
@@ -141,7 +141,7 @@ public class LiveDictServiceImpl extends ServiceImpl<LiveDictMapper, LiveDictDO>
}
}
oldIds
.
removeAll
(
newStudentIds2
);
//
以前的人要删掉的
oldIds
.
removeAll
(
newStudentIds2
);
//
if
(
oldIds
.
size
()
>
0
)
{
liveClassesMapper
.
delete
(
new
QueryWrapper
<
LiveClassesDO
>()
.
lambda
()
...
...
src/main/java/com/subsidy/service/impl/LivePlaybackHistoryServiceImpl.java
View file @
c55137b
...
...
@@ -134,7 +134,7 @@ public class LivePlaybackHistoryServiceImpl extends ServiceImpl<LivePlaybackHist
exportPlaybacksVO
.
setStartTimes
(
changeListToString
(
startTimes
));
exportPlaybacksVOS
.
add
(
exportPlaybacksVO
);
}
return
iPage
.
getRecords
()
;
return
exportPlaybacksVOS
;
}
public
List
<
LiveVodsDO
>
playbacks
(
LiveDictDO
liveDictDO
)
{
...
...
src/main/resources/mapper/LiveDictMapper.xml
View file @
c55137b
...
...
@@ -67,7 +67,7 @@
WHERE
t.delete_date IS NULL
AND t2.delete_date IS NULL
and t.id = #{liveId}
and t.
live_
id = #{liveId}
</select>
<update
id=
"updateStatus"
parameterType=
"long"
>
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment