From c9df4cfec262ca54af52715af60a1276c37d08c5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 29 一月 2024 20:12:24 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
index ce6f73d..638ff33 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
@@ -241,6 +241,44 @@
return pageData;
}
+
+
+
+ @Override
+ public List<ApplyDetail> findListForCompany(ApplyDetailPageDTO applyDetailPageDTO) {
+ MPJLambdaWrapper<ApplyDetail> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(ApplyDetail.class);
+ queryWrapper.selectAs(DispatchUnit::getName,ApplyDetail::getDuName);
+ queryWrapper.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName);
+ queryWrapper.selectAs(Member::getIdcardNo,ApplyDetail::getIdcardNo);
+ queryWrapper.selectAs(Member::getName,ApplyDetail::getMemberName);
+ queryWrapper.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId);
+ queryWrapper.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId);
+ queryWrapper.leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId);
+ queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getApplyId()),ApplyDetail::getApplyId,applyDetailPageDTO.getApplyId());
+ queryWrapper.ge(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
+ &&!applyDetailPageDTO.getApplyStatus().equals(Constants.ZERO),
+ ApplyDetail::getStartTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 00:00:00");
+ //鍦ㄤ繚
+ queryWrapper.le(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
+ &&applyDetailPageDTO.getApplyStatus().equals(Constants.ONE),
+ ApplyDetail::getEndTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 23:59:59");
+ //涓嶅湪淇�
+ queryWrapper.ge(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
+ &&applyDetailPageDTO.getApplyStatus().equals(Constants.TWO),
+ ApplyDetail::getEndTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 23:59:59");
+ queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getDuId()),ApplyDetail::getDuId,applyDetailPageDTO.getDuId());
+ queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getWorkTypeId()),ApplyDetail::getWorktypeId,applyDetailPageDTO.getWorkTypeId());
+ queryWrapper.like(StringUtils.isNotBlank(applyDetailPageDTO.getMemberName()),Member::getName,applyDetailPageDTO.getMemberName());
+ queryWrapper.ge(StringUtils.isNotBlank(applyDetailPageDTO.getStartTimeS()),ApplyDetail::getStartTime,applyDetailPageDTO.getStartTimeS()+" 00:00:00");
+ queryWrapper.le(StringUtils.isNotBlank(applyDetailPageDTO.getStartTimeE()),ApplyDetail::getStartTime,applyDetailPageDTO.getStartTimeE()+" 23:59:59");
+ queryWrapper.ge(StringUtils.isNotBlank(applyDetailPageDTO.getEndTimeS()),ApplyDetail::getEndTime,applyDetailPageDTO.getEndTimeS()+" 00:00:00");
+ queryWrapper.le(StringUtils.isNotBlank(applyDetailPageDTO.getEndTimeE()),ApplyDetail::getEndTime,applyDetailPageDTO.getEndTimeE()+" 23:59:59");
+ return applyDetailJoinMapper.selectJoinList(ApplyDetail.class,queryWrapper);
+ }
+
+
+
@Override
public long count(ApplyDetail applyDetail) {
QueryWrapper<ApplyDetail> wrapper = new QueryWrapper<>(applyDetail);
@@ -255,7 +293,6 @@
.selectAll(ApplyDetail.class)
.selectAs(DispatchUnit::getName,ApplyDetail::getDuName)
.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName)
- .selectAs(Member::getName,ApplyDetail::getMemberName)
.selectAs(Solutions::getName,ApplyDetail::getSolutionName)
.selectAs(ApplyChange::getValidCode,ApplyDetail::getValidCode)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
--
Gitblit v1.9.3