From 10f3a98226685340439a0b52afc62013c65da535 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 17:24:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index 2b41210..f875670 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -18,6 +18,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.DateIntervalVO;
import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ApproveService;
import com.doumee.service.business.CarUseBookService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -151,8 +152,14 @@
}
}
+ /**
+ *
+ * @param id 涓婚敭
+ * @param memberId
+ * @return
+ */
@Override
- public CarUseBook findById(Integer id) {
+ public CarUseBook findById(Integer id,Integer memberId) {
MPJLambdaWrapper<CarUseBook> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(CarUseBook.class);
queryWrapper.select("t1.name",CarUseBook::getMemberName);
@@ -166,21 +173,11 @@
.eq(CarUseBook::getId,id)
.last("limit 1" );
CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper);
- //瀹℃壒璁板綍
- List<Approve> approveList = approveJoinMapper.selectJoinList(Approve.class,
- new MPJLambdaWrapper<Approve>()
- .selectAll(Approve.class)
- .selectAs(Member::getName,Approve::getMemberName)
- .selectAs(Member::getPhone,Approve::getMemberPhone)
- .selectAs(Company::getName,Approve::getCompanyName)
- .leftJoin(Member.class,Member::getId,Approve::getChekorId)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .eq(Approve::getIsdeleted,Constants.ZERO)
- .eq(Approve::getObjType,Constants.ONE)
- .eq(Approve::getObjId,id)
- .orderByAsc(Approve::getLevel)
+ model.setApproveDateVO(
+ approveService.arrangeApprovedData(id,
+ model.getType().equals(Constants.ZERO)?3:4,
+ memberId)
);
- model.setApproveList(approveList);
return model;
}
--
Gitblit v1.9.3