|
|
@@ -1189,7 +1189,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements
|
|
|
Long l1,l2;
|
|
|
int diff1,diff2;
|
|
|
for(CustomerListOut clo: tmpList){
|
|
|
- s1 = StringUtils.isBlank(clo.getLastFollowTime()) ? clo.getTransferTime() : clo.getLastFollowTime();
|
|
|
+ //s1 = StringUtils.isBlank(clo.getLastFollowTime()) ? clo.getTransferTime() : clo.getLastFollowTime();
|
|
|
+ if (StringUtils.isNotBlank(clo.getLastFollowTime())){
|
|
|
+ if(Integer.valueOf(clo.getLastFollowTime())>Integer.valueOf(clo.getTransferTime())) {
|
|
|
+ s1=clo.getLastFollowTime();
|
|
|
+ }else {
|
|
|
+ s1=clo.getTransferTime();
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ s1=clo.getTransferTime();
|
|
|
+ }
|
|
|
s2 = StringUtils.isBlank(clo.getLastSignTime()) ? clo.getTransferTime() : clo.getLastSignTime();
|
|
|
try {
|
|
|
l1 = DateUtils.parseDate(s1, AFTConstants.YYYYMMDDHHMMSS).getTime();
|