|
@@ -11,6 +11,7 @@ import com.flow.service.ReportTemplateService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.util.Optional;
|
|
|
import java.util.Set;
|
|
|
|
|
|
@Service
|
|
@@ -25,13 +26,21 @@ public class ReportTemplateServiceImpl extends BaseServiceImpl<ReportTemplateDao
|
|
|
public PageResult<ReportTemplate> getList(ReportTemplateQuery reportTemplateQuery) {
|
|
|
ReportTemplate reportTemplate = reportTemplateMapper.toEntity(reportTemplateQuery);
|
|
|
Page<ReportTemplate> page = reportTemplateDao.lambdaQueryChain()
|
|
|
- .setEntity(reportTemplate)
|
|
|
+ .select(ReportTemplate.class, i -> !i.getColumn().equals("data"))
|
|
|
.page(
|
|
|
new Page<>(reportTemplateQuery.getPage(), reportTemplateQuery.getLimit())
|
|
|
);
|
|
|
return new PageResult<>(page.getTotal(), page.getRecords());
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public ReportTemplate getTemplate(String id) {
|
|
|
+ Optional<ReportTemplate> optional = reportTemplateDao.lambdaQueryChain()
|
|
|
+ .eq(ReportTemplate::getId, id)
|
|
|
+ .oneOpt();
|
|
|
+ return optional.orElse(null);
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public ReportTemplate create(ReportTemplate reportTemplate) {
|
|
|
reportTemplateDao.insert(reportTemplate);
|