From 3d5f77b68bf28291c76306b274a230dd726838d2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 11:03:37 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java | 70 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
index d1b698e..f127c72 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
@@ -13,11 +13,13 @@
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.IdentityInfo;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.IdentityInfoService;
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 io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -230,25 +232,32 @@
}
private void addMemberModelByType(Integer id,Integer type, List<IdentityInfo> list,String path) {
- LambdaQueryWrapper<IdentityInfo> wrapper = new LambdaQueryWrapper<IdentityInfo>()
+ MPJLambdaWrapper<IdentityInfo> wrapper = new MPJLambdaWrapper<IdentityInfo>()
+ .selectAll(IdentityInfo.class).selectAs(SystemUser::getUsername,IdentityInfo::getEditorName)
+ .leftJoin(SystemUser.class,SystemUser::getId,IdentityInfo::getUpdateUser)
.orderByDesc(IdentityInfo::getCreateTime )//鍙栨渶鏂颁竴鏉�
.eq(IdentityInfo::getMemberId,id)
.eq(IdentityInfo::getType,type)
.eq(IdentityInfo::getDeleted,Constants.ZERO)
.last("limit 1");
- IdentityInfo model = identityInfoMapper.selectOne(wrapper);
+ IdentityInfo model = identityInfoMapper.selectJoinOne(IdentityInfo.class,wrapper);
if(model !=null){
+ model.setImgList(new ArrayList<>());
if(StringUtils.isNotBlank(model.getImg1())){
model.setImg1(path+model.getImg1());
+ model.getImgList().add(model.getImg1());
}
if(StringUtils.isNotBlank(model.getImg2())){
- model.setImg1(path+model.getImg2());
+ model.setImg2(path+model.getImg2());
+ model.getImgList().add(model.getImg2());
}
if(StringUtils.isNotBlank(model.getImg3())) {
- model.setImg1(path + model.getImg3());
+ model.setImg3(path + model.getImg3());
+ model.getImgList().add(model.getImg3());
}
if(StringUtils.isNotBlank(model.getImg4())){
- model.setImg1(path+model.getImg4());
+ model.setImg4(path+model.getImg4());
+ model.getImgList().add(model.getImg4());
}
list.add(model);
}
@@ -257,67 +266,70 @@
@Override
public PageData<IdentityInfo> findPage(PageWrap<IdentityInfo> pageWrap) {
IPage<IdentityInfo> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<IdentityInfo> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<IdentityInfo> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setDeleted(Constants.ZERO);
+ queryWrapper.selectAll(IdentityInfo.class).selectAs(SystemUser::getUsername,IdentityInfo::getEditorName)
+ .leftJoin(SystemUser.class,SystemUser::getId,IdentityInfo::getUpdateUser);
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(IdentityInfo::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getDeleted() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getDeleted, pageWrap.getModel().getDeleted());
+ queryWrapper.eq(IdentityInfo::getDeleted, pageWrap.getModel().getDeleted());
}
if (pageWrap.getModel().getCreateUser() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getCreateUser, pageWrap.getModel().getCreateUser());
+ queryWrapper.eq(IdentityInfo::getCreateUser, pageWrap.getModel().getCreateUser());
}
if (pageWrap.getModel().getCreateTime() != null) {
- queryWrapper.lambda().ge(IdentityInfo::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
- queryWrapper.lambda().le(IdentityInfo::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
+ queryWrapper.ge(IdentityInfo::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
+ queryWrapper.le(IdentityInfo::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
}
if (pageWrap.getModel().getUpdateUser() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getUpdateUser, pageWrap.getModel().getUpdateUser());
+ queryWrapper.eq(IdentityInfo::getUpdateUser, pageWrap.getModel().getUpdateUser());
}
if (pageWrap.getModel().getUpdateTime() != null) {
- queryWrapper.lambda().ge(IdentityInfo::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
- queryWrapper.lambda().le(IdentityInfo::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
+ queryWrapper.ge(IdentityInfo::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
+ queryWrapper.le(IdentityInfo::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(IdentityInfo::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getType, pageWrap.getModel().getType());
+ queryWrapper.eq(IdentityInfo::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getMemberId, pageWrap.getModel().getMemberId());
+ queryWrapper.eq(IdentityInfo::getMemberId, pageWrap.getModel().getMemberId());
}
if (pageWrap.getModel().getAuthType() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getAuthType, pageWrap.getModel().getAuthType());
+ queryWrapper.eq(IdentityInfo::getAuthType, pageWrap.getModel().getAuthType());
}
if (pageWrap.getModel().getLinkName() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getLinkName, pageWrap.getModel().getLinkName());
+ queryWrapper.eq(IdentityInfo::getLinkName, pageWrap.getModel().getLinkName());
}
if (pageWrap.getModel().getTelephone() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getTelephone, pageWrap.getModel().getTelephone());
+ queryWrapper.eq(IdentityInfo::getTelephone, pageWrap.getModel().getTelephone());
}
if (pageWrap.getModel().getLocation() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getLocation, pageWrap.getModel().getLocation());
+ queryWrapper.eq(IdentityInfo::getLocation, pageWrap.getModel().getLocation());
}
if (pageWrap.getModel().getCompanyName() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getCompanyName, pageWrap.getModel().getCompanyName());
+ queryWrapper.eq(IdentityInfo::getCompanyName, pageWrap.getModel().getCompanyName());
}
if (pageWrap.getModel().getLat() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getLat, pageWrap.getModel().getLat());
+ queryWrapper.eq(IdentityInfo::getLat, pageWrap.getModel().getLat());
}
if (pageWrap.getModel().getLgt() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getLgt, pageWrap.getModel().getLgt());
+ queryWrapper.eq(IdentityInfo::getLgt, pageWrap.getModel().getLgt());
}
if (pageWrap.getModel().getAuditStatus() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getAuditStatus, pageWrap.getModel().getAuditStatus());
+ queryWrapper.eq(IdentityInfo::getAuditStatus, pageWrap.getModel().getAuditStatus());
}
if (pageWrap.getModel().getAuditTime() != null) {
- queryWrapper.lambda().ge(IdentityInfo::getAuditTime, Utils.Date.getStart(pageWrap.getModel().getAuditTime()));
- queryWrapper.lambda().le(IdentityInfo::getAuditTime, Utils.Date.getEnd(pageWrap.getModel().getAuditTime()));
+ queryWrapper.ge(IdentityInfo::getAuditTime, Utils.Date.getStart(pageWrap.getModel().getAuditTime()));
+ queryWrapper.le(IdentityInfo::getAuditTime, Utils.Date.getEnd(pageWrap.getModel().getAuditTime()));
}
if (pageWrap.getModel().getAuditRemark() != null) {
- queryWrapper.lambda().eq(IdentityInfo::getAuditRemark, pageWrap.getModel().getAuditRemark());
+ queryWrapper.eq(IdentityInfo::getAuditRemark, pageWrap.getModel().getAuditRemark());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -326,7 +338,7 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(identityInfoMapper.selectPage(page, queryWrapper));
+ return PageData.from(identityInfoMapper.selectJoinPage(page,IdentityInfo.class, queryWrapper));
}
@Override
--
Gitblit v1.9.3