|
@@ -30,25 +30,26 @@ public class QualificationCertificateServiceImpl extends ServiceImpl<Qualificati
|
|
|
@Override
|
|
@Override
|
|
|
public Page<QualificationCertificate> pageQualificationCertificate(Long pageNum, Long pageSize) {
|
|
public Page<QualificationCertificate> pageQualificationCertificate(Long pageNum, Long pageSize) {
|
|
|
Page<QualificationCertificate> page = new Page<>(pageNum, pageSize);
|
|
Page<QualificationCertificate> page = new Page<>(pageNum, pageSize);
|
|
|
- if(page.getRecords() != null){
|
|
|
|
|
- page.getRecords().forEach(item -> {
|
|
|
|
|
|
|
+ LambdaQueryWrapper<QualificationCertificate> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ queryWrapper.orderByDesc(QualificationCertificate::getUpdateTime);
|
|
|
|
|
+ Page<QualificationCertificate> pageList = page(page,queryWrapper);
|
|
|
|
|
+ if(pageList.getRecords() != null){
|
|
|
|
|
+ pageList.getRecords().forEach(item -> {
|
|
|
item.setFileList(fileManageService.listFileByFid(item.getId()));
|
|
item.setFileList(fileManageService.listFileByFid(item.getId()));
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
- LambdaQueryWrapper<QualificationCertificate> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
- queryWrapper.orderByDesc(QualificationCertificate::getUpdateTime);
|
|
|
|
|
- return page(page,queryWrapper);
|
|
|
|
|
|
|
+ return pageList;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public List<QualificationCertificate> listQualificationCertificate() {
|
|
public List<QualificationCertificate> listQualificationCertificate() {
|
|
|
- List<QualificationCertificate> list = list();
|
|
|
|
|
|
|
+ LambdaQueryWrapper<QualificationCertificate> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ queryWrapper.orderByDesc(QualificationCertificate::getUpdateTime);
|
|
|
|
|
+ List<QualificationCertificate> list = list(queryWrapper);
|
|
|
list.forEach(item -> {
|
|
list.forEach(item -> {
|
|
|
item.setFileList(fileManageService.listFileByFid(item.getId()));
|
|
item.setFileList(fileManageService.listFileByFid(item.getId()));
|
|
|
});
|
|
});
|
|
|
- LambdaQueryWrapper<QualificationCertificate> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
- queryWrapper.orderByDesc(QualificationCertificate::getUpdateTime);
|
|
|
|
|
- return list(queryWrapper);
|
|
|
|
|
|
|
+ return list;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -61,7 +62,7 @@ public class QualificationCertificateServiceImpl extends ServiceImpl<Qualificati
|
|
|
return qualificationCertificate;
|
|
return qualificationCertificate;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- @Transactional
|
|
|
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
@Override
|
|
@Override
|
|
|
public QualificationCertificate saveQualificationCertificate(QualificationCertificate entity) {
|
|
public QualificationCertificate saveQualificationCertificate(QualificationCertificate entity) {
|
|
|
entity.setId(UUID.randomUUID().toString());
|
|
entity.setId(UUID.randomUUID().toString());
|