|
|
@@ -89,6 +89,7 @@ public class DzCardsServiceImpl implements IDzCardsService
|
|
|
}
|
|
|
|
|
|
private List<DzCards> fillNames(List<DzCards> list) {
|
|
|
+ Long start = System.currentTimeMillis();
|
|
|
Set<Long> classIdSet = Sets.newHashSet();
|
|
|
Set<Long> schoolIdSet = Sets.newHashSet();
|
|
|
Set<Long> deptIdSet = Sets.newHashSet();
|
|
|
@@ -142,13 +143,21 @@ public class DzCardsServiceImpl implements IDzCardsService
|
|
|
}
|
|
|
if (userMap.containsKey(c.getCardId())) {
|
|
|
SysUser user = userMap.get(c.getCardId());
|
|
|
- c.setPhonenumber(user.getPhonenumber());
|
|
|
- c.setNickName(user.getNickName());
|
|
|
- c.setExamType(user.getExamType().name());
|
|
|
- c.setLocation(user.getLocation());
|
|
|
+ if (user != null ) {
|
|
|
+ c.setPhonenumber(user.getPhonenumber());
|
|
|
+ c.setNickName(user.getNickName());
|
|
|
+ c.setExamType(user.getExamType().name());
|
|
|
+ c.setLocation(user.getLocation());
|
|
|
+ c.setExamMajor(user.getExamMajor());
|
|
|
+ c.setExamMajorName(user.getExamMajorName());
|
|
|
+ if (user.getDirectedStudy() != null){
|
|
|
+ c.setDirectedStudy(user.getDirectedStudy());
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
c.setType(CardType.getNewVal(c.getType()));
|
|
|
}
|
|
|
+ System.out.println( "查询学习卡耗时2:{}"+( System.currentTimeMillis() - start));
|
|
|
return list;
|
|
|
}
|
|
|
|
|
|
@@ -167,7 +176,10 @@ public class DzCardsServiceImpl implements IDzCardsService
|
|
|
@Override
|
|
|
public List<DzCards> selectDzCardsList2(DzCards dzCards)
|
|
|
{
|
|
|
- return fillNames(dzCardsMapper.selectDzCardsList2(dzCards));
|
|
|
+ long start = System.currentTimeMillis();
|
|
|
+ List<DzCards> cards=dzCardsMapper.selectDzCardsList2(dzCards);
|
|
|
+ System.out.println( "查询学习卡耗时1:{}"+( System.currentTimeMillis() - start));
|
|
|
+ return fillNames(cards);
|
|
|
}
|
|
|
|
|
|
/**
|