From d1f203a6f31ec5f5fed66b07213e109c1fc54591 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 03 六月 2025 14:35:17 +0800
Subject: [PATCH] 提交一把订单

---
 server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java |    8 ++++++++
 1 files changed, 8 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 bbf26b0..529c16c 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
@@ -217,6 +217,7 @@
         queryWrapper.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId);
         queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
         queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId);
+        queryWrapper.eq(ApplyDetail::getIsdeleted,Constants.ZERO);
 
         ApplyDetailPageDTO applyDetailPageDTO = pageWrap.getModel();
 
@@ -305,14 +306,21 @@
         queryWrapper.selectAs(InsuranceApply::getCode,ApplyDetail::getApplyCode);
         queryWrapper.selectAs(Solutions::getId,ApplyDetail::getSolutionId);
         queryWrapper.selectAs(Solutions::getName,ApplyDetail::getSolutionName);
+        queryWrapper.selectAs(Solutions::getType,ApplyDetail::getSolutionType);
+        queryWrapper.selectAs(Insurance::getBaseId,ApplyDetail::getInsuranceId);
         queryWrapper.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName);
         queryWrapper.selectAs(Member::getIdcardNo,ApplyDetail::getIdcardNo);
         queryWrapper.selectAs(Member::getName,ApplyDetail::getMemberName);
+        queryWrapper.selectAs(InsuranceApply::getStartTime,ApplyDetail::getParentStartTime);
+        queryWrapper.selectAs(InsuranceApply::getEndTime,ApplyDetail::getParentEndTime);
+
+        queryWrapper.selectAs(Solutions::getParentId,ApplyDetail::getSolutionBaseId);
         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.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId);
         queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
+        queryWrapper.leftJoin(Insurance.class,Insurance::getId,Solutions::getInsuranceId);
         queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getApplyId()),ApplyDetail::getApplyId,applyDetailPageDTO.getApplyId());
         queryWrapper.ge(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
                         &&!applyDetailPageDTO.getApplyStatus().equals(Constants.ZERO),

--
Gitblit v1.9.3