From 87cc98263db6d1eeac48d0c06852c559cd0838ea Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 20 一月 2024 09:37:59 +0800
Subject: [PATCH] 111

---
 server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 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 2c6ed89..20d8c43 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
@@ -173,8 +173,18 @@
         queryWrapper.selectAs(DispatchUnit::getName,ApplyDetail::getDuName);
         queryWrapper.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName);
         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);
+
+
         ApplyDetailPageDTO applyDetailPageDTO = pageWrap.getModel();
         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),
@@ -207,4 +217,32 @@
         QueryWrapper<ApplyDetail> wrapper = new QueryWrapper<>(applyDetail);
         return applyDetailMapper.selectCount(wrapper);
     }
+
+
+    @Override
+    public List<ApplyDetail> getMemberApplyList(Integer memberId) {
+        List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,
+                new MPJLambdaWrapper<ApplyDetail>()
+                        .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)
+                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                        .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
+                        .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
+                        .leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId)
+                        .leftJoin(ApplyChagneDetail.class,ApplyChagneDetail::getId,ApplyDetail::getFromId)
+                        .leftJoin(ApplyChange.class,ApplyChange::getId,ApplyChagneDetail::getApplyChangeId)
+                        .eq(ApplyDetail::getMemberId,memberId)
+                        .orderByAsc(ApplyDetail::getCreateDate)
+        );
+        return applyDetailList;
+    }
+
+
+
+
 }

--
Gitblit v1.9.3