Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
task-kolon
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
piplus-v3
task-kolon
Commits
e7a42aff
Commit
e7a42aff
authored
Jul 07, 2016
by
陈家荣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
56de2d07
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
KolonMemberServiceImpl.java
...java/com/hdp/pi/service/kolon/KolonMemberServiceImpl.java
+5
-2
No files found.
src/main/java/com/hdp/pi/service/kolon/KolonMemberServiceImpl.java
View file @
e7a42aff
...
@@ -354,8 +354,11 @@ public class KolonMemberServiceImpl implements KolonMemberService {
...
@@ -354,8 +354,11 @@ public class KolonMemberServiceImpl implements KolonMemberService {
List
<
String
[]>
addData
=
getDataList
();
List
<
String
[]>
addData
=
getDataList
();
List
<
String
[]>
updateData
=
getDataList
();
List
<
String
[]>
updateData
=
getDataList
();
for
(
KolonMember
km
:
kolonMembers
){
for
(
KolonMember
km
:
kolonMembers
){
//查询Member,
//查询Member
Member
member
=
memberService
.
findById
(
km
.
mid
);
Member
member
=
null
;
if
(
Util
.
isNotNull
(
km
.
mid
)){
member
=
memberService
.
findById
(
km
.
mid
);
}
if
(
km
.
dataSource
==
2
){
if
(
km
.
dataSource
==
2
){
updateData
.
add
(
convertDataUpdate
(
km
,
member
,
null
));
updateData
.
add
(
convertDataUpdate
(
km
,
member
,
null
));
}
else
if
(
km
.
dataSource
==
1
&&
km
.
joinTime
.
after
(
lastSendDate
)){
//加入时间在发送时间之后,数据是新增的
}
else
if
(
km
.
dataSource
==
1
&&
km
.
joinTime
.
after
(
lastSendDate
)){
//加入时间在发送时间之后,数据是新增的
...
...
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