From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChagneDetailServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChagneDetailServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChagneDetailServiceImpl.java
index 0266b4f..c266424 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChagneDetailServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChagneDetailServiceImpl.java
@@ -98,10 +98,13 @@
queryWrapper.select("t3.name",ApplyChagneDetail::getDuName);
queryWrapper.select("t4.name",ApplyChagneDetail::getOldWorkTypeName);
queryWrapper.select("t5.name",ApplyChagneDetail::getOldDuName);
+ queryWrapper.selectAs(Company::getName,ApplyChagneDetail::getCompanyName);
+ queryWrapper.selectAs(Company::getId,ApplyChagneDetail::getCompanyId);
queryWrapper.selectAs(Member::getName,ApplyChagneDetail::getMemberName);
queryWrapper.selectAs(Member::getSex,ApplyChagneDetail::getSex);
queryWrapper.selectAs(Member::getIdcardNo,ApplyChagneDetail::getMemberIdcardNo);
queryWrapper.leftJoin(Member.class,Member::getId,ApplyChagneDetail::getMemberId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getWorktypeId);
queryWrapper.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyChagneDetail::getDuId);
queryWrapper.leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getOldWorktypeId);
@@ -111,6 +114,7 @@
queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getDuId()),ApplyChagneDetail::getDuId,applyDetailPageDTO.getDuId());
queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getWorktypeId()),ApplyChagneDetail::getWorktypeId,applyDetailPageDTO.getWorktypeId());
queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getApplyChangeId()),ApplyChagneDetail::getApplyChangeId,applyDetailPageDTO.getApplyChangeId());
+ queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getUnionChangeId()),ApplyChagneDetail::getUnionChangeId,applyDetailPageDTO.getUnionChangeId());
queryWrapper.like(StringUtils.isNotBlank(applyDetailPageDTO.getMemberName()),Member::getName,applyDetailPageDTO.getMemberName());
List<ApplyChagneDetail> pageData = applyChangeDetailJoinMapper.selectJoinList( ApplyChagneDetail.class, queryWrapper);
@@ -190,6 +194,7 @@
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.selectAll(ApplyChagneDetail.class);
queryWrapper.selectAs(Company::getName,ApplyChagneDetail::getCompanyName);
+ queryWrapper.selectAs(Company::getId,ApplyChagneDetail::getCompanyId);
queryWrapper.select("t2.name",ApplyChagneDetail::getWorkTypeName);
queryWrapper.select("t3.name",ApplyChagneDetail::getDuName);
queryWrapper.select("t4.name",ApplyChagneDetail::getOldWorkTypeName);
--
Gitblit v1.9.3