From 2e6f381d09669635473faf5dd4a3f01b5797d97e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 27 五月 2024 16:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
index c9e8154..e200ffb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
@@ -2,19 +2,28 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.HiddenDangerLogMapper;
+import com.doumee.dao.business.join.HiddenDangerLogJoinMapper;
+import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.HiddenDanger;
import com.doumee.dao.business.model.HiddenDangerLog;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.HiddenDangerLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import java.util.List;
+import java.util.Objects;
/**
* 鐞嗚碃鎿嶄綔鍘嗗彶琛⊿ervice瀹炵幇
@@ -26,6 +35,9 @@
@Autowired
private HiddenDangerLogMapper hiddenDangerLogMapper;
+
+ @Autowired
+ private HiddenDangerLogJoinMapper hiddenDangerLogJoinMapper;
@Override
public Integer create(HiddenDangerLog hiddenDangerLog) {
@@ -80,8 +92,20 @@
@Override
public List<HiddenDangerLog> findList(HiddenDangerLog hiddenDangerLog) {
- QueryWrapper<HiddenDangerLog> wrapper = new QueryWrapper<>(hiddenDangerLog);
- return hiddenDangerLogMapper.selectList(wrapper);
+ List<HiddenDangerLog> hiddenDangerLogList = hiddenDangerLogJoinMapper.selectJoinList(HiddenDangerLog.class,
+ new MPJLambdaWrapper<HiddenDangerLog>()
+ .selectAll(HiddenDangerLog.class)
+ .selectAs(SystemUser::getRealname,HiddenDangerLog::getCreateUserName)
+ .selectAs(SystemUser::getAvatar,HiddenDangerLog::getAvatar)
+ .selectAs(Company::getName,HiddenDangerLog::getCompanyName)
+ .leftJoin(SystemUser.class,SystemUser::getId,HiddenDangerLog::getCreator)
+ .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+ .eq(Objects.nonNull(hiddenDangerLog.getHiddenDangerId()),HiddenDangerLog::getHiddenDangerId,hiddenDangerLog.getHiddenDangerId())
+ .eq(Objects.isNull(hiddenDangerLog.getHiddenDangerId()),"1",2)
+ .eq(HiddenDangerLog::getIsdeleted, Constants.ZERO)
+ .orderByAsc(HiddenDangerLog::getCreateDate)
+ );
+ return hiddenDangerLogList;
}
@Override
--
Gitblit v1.9.3