From b6d477ad41e2a8ff9393de2beba2e735c78cf781 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 22 七月 2024 18:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 93 +++++++++++++++++++++++++---------------------
1 files changed, 51 insertions(+), 42 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index 415104c..531a019 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -11,6 +11,7 @@
import com.ycl.platform.domain.form.ReportForm;
import com.ycl.platform.domain.query.ReportQuery;
import com.ycl.platform.domain.vo.ReportVO;
+import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.mapper.ReportMapper;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwPointMapper;
@@ -26,6 +27,7 @@
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -115,48 +117,9 @@
*/
@Override
public Result page(ReportQuery query) {
-
- if (StringUtils.isNotBlank(query.getPointId())) {
- LambdaQueryWrapper<YwPoint> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.like(YwPoint::getPointName, query.getPointId());
- query.setPointIdList(ywpointMapper.selectList(queryWrapper).stream().map(YwPoint::getId).collect(Collectors.toList()));
- if(CollectionUtils.isEmpty(query.getPointIdList())) {
- return Result.ok();
- }
- }
- if (StringUtils.isNotBlank(query.getPeopleId())) {
- LambdaQueryWrapper<YwPeople> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.like(YwPeople::getYwPersonName, query.getPeopleId());
- query.setPeopleIdList(peopleMapper.selectList(queryWrapper).stream().map(YwPeople::getId).collect(Collectors.toList()));
- if(CollectionUtils.isEmpty(query.getPeopleIdList())) {
- return Result.ok();
- }
- }
-
- IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
- .eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType())
- .le(Objects.nonNull(query.getBeginCreateTime()), Report::getBeginCreateTime, query.getBeginCreateTime())
- .ge(Objects.nonNull(query.getEndCreateTime()), Report::getEndCreateTime, query.getEndCreateTime())
- .in(!CollectionUtils.isEmpty(query.getPointIdList()), Report::getPointId, query.getPointIdList())
- .in(!CollectionUtils.isEmpty(query.getPeopleIdList()), Report::getPeopleId, query.getPeopleIdList())
- .orderByDesc(Report::getCreateTime)
- .page(PageUtil.getPage(query, Report.class));
-
- List<ReportVO> vos = page.getRecords().stream()
- .map(
- entity -> {
- ReportVO vo = ReportVO.getVoByEntity(entity, null);
- YwUnit unit = unitMapper.selectById(vo.getUnitId());
- vo.setUnitName(unit.getUnitName());
- YwPeople ywPeople = peopleMapper.selectById(vo.getPeopleId());
- vo.setPeopleName(ywPeople.getYwPersonName());
- YwPoint ywPoint = ywpointMapper.selectById(vo.getPointId());
- vo.setPointName(ywPoint.getPointName());
- return vo;
- }
- )
- .collect(Collectors.toList());
- return Result.ok().data(vos).total(page.getTotal());
+ IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class);
+ baseMapper.page(page, query);
+ return Result.ok().data(page).total(page.getTotal());
}
/**
@@ -187,4 +150,50 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ public List<ReportVO> export(ReportQuery query) {
+
+ if (StringUtils.isNotBlank(query.getPointId())) {
+ LambdaQueryWrapper<YwPoint> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.like(YwPoint::getPointName, query.getPointId());
+ query.setPointIdList(ywpointMapper.selectList(queryWrapper).stream().map(YwPoint::getId).collect(Collectors.toList()));
+ if(CollectionUtils.isEmpty(query.getPointIdList())) {
+ return new ArrayList<>();
+ }
+ }
+ if (StringUtils.isNotBlank(query.getPeopleId())) {
+ LambdaQueryWrapper<YwPeople> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.like(YwPeople::getYwPersonName, query.getPeopleId());
+ query.setPeopleIdList(peopleMapper.selectList(queryWrapper).stream().map(YwPeople::getId).collect(Collectors.toList()));
+ if(CollectionUtils.isEmpty(query.getPeopleIdList())) {
+ return new ArrayList<>();
+ }
+ }
+
+ IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType())
+ .le(Objects.nonNull(query.getBeginCreateTime()), Report::getBeginCreateTime, query.getBeginCreateTime())
+ .ge(Objects.nonNull(query.getEndCreateTime()), Report::getEndCreateTime, query.getEndCreateTime())
+ .in(!CollectionUtils.isEmpty(query.getPointIdList()), Report::getPointId, query.getPointIdList())
+ .in(!CollectionUtils.isEmpty(query.getPeopleIdList()), Report::getPeopleId, query.getPeopleIdList())
+ .orderByDesc(Report::getCreateTime)
+ .page(PageUtil.getPage(query, Report.class));
+
+ List<ReportVO> vos = page.getRecords().stream()
+ .map(
+ entity -> {
+ ReportVO vo = ReportVO.getVoByEntity(entity, null);
+ YwUnit unit = unitMapper.selectById(vo.getUnitId());
+ vo.setUnitName(unit.getUnitName());
+ YwPeople ywPeople = peopleMapper.selectById(vo.getPeopleId());
+ vo.setPeopleName(ywPeople.getYwPersonName());
+ YwPoint ywPoint = ywpointMapper.selectById(vo.getPointId());
+ vo.setPointName(ywPoint.getPointName());
+ return vo;
+ }
+ )
+ .collect(Collectors.toList());
+ return vos;
+ }
+
}
--
Gitblit v1.8.0