From 30a14783481d100a6503a56c902b47182e542c93 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 08 十二月 2023 15:42:09 +0800
Subject: [PATCH] #组织树 和企业下的人员信息 人员卡信息
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 79 ++++++++++++++++++++++++++-------------
1 files changed, 52 insertions(+), 27 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index 6ab53c2..58a2b9c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -1,20 +1,28 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.lang.PatternPool;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ReUtil;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberCardMapper;
+import com.doumee.dao.business.join.MemberCardJoinMapper;
+import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberCard;
import com.doumee.service.business.MemberCardService;
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 java.util.List;
+import java.util.Objects;
/**
* 鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛⊿ervice瀹炵幇
@@ -26,6 +34,9 @@
@Autowired
private MemberCardMapper memberCardMapper;
+
+ @Autowired
+ private MemberCardJoinMapper memberCardJoinMapper;
@Override
public Integer create(MemberCard memberCard) {
@@ -83,65 +94,79 @@
QueryWrapper<MemberCard> wrapper = new QueryWrapper<>(memberCard);
return memberCardMapper.selectList(wrapper);
}
-
+
@Override
public PageData<MemberCard> findPage(PageWrap<MemberCard> pageWrap) {
IPage<MemberCard> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<MemberCard> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<MemberCard> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(MemberCard::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(MemberCard::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(MemberCard::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(MemberCard::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(MemberCard::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(MemberCard::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(MemberCard::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(MemberCard::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(MemberCard::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(MemberCard::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(MemberCard::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(MemberCard::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(MemberCard::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(MemberCard::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(MemberCard::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(MemberCard::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(MemberCard::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(MemberCard::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(MemberCard::getMemberId, pageWrap.getModel().getMemberId());
+ queryWrapper.eq(MemberCard::getMemberId, pageWrap.getModel().getMemberId());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(MemberCard::getCode, pageWrap.getModel().getCode());
+ queryWrapper.eq(MemberCard::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getPassward() != null) {
- queryWrapper.lambda().eq(MemberCard::getPassward, pageWrap.getModel().getPassward());
+ queryWrapper.eq(MemberCard::getPassward, pageWrap.getModel().getPassward());
}
if (pageWrap.getModel().getHkId() != null) {
- queryWrapper.lambda().eq(MemberCard::getHkId, pageWrap.getModel().getHkId());
+ queryWrapper.eq(MemberCard::getHkId, pageWrap.getModel().getHkId());
}
if (pageWrap.getModel().getHkStatus() != null) {
- queryWrapper.lambda().eq(MemberCard::getHkStatus, pageWrap.getModel().getHkStatus());
+ queryWrapper.eq(MemberCard::getHkStatus, pageWrap.getModel().getHkStatus());
}
if (pageWrap.getModel().getHkDate() != null) {
- queryWrapper.lambda().ge(MemberCard::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
- queryWrapper.lambda().le(MemberCard::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
+ queryWrapper.ge(MemberCard::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
+ queryWrapper.le(MemberCard::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(MemberCard::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(MemberCard::getStatus, pageWrap.getModel().getStatus());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(memberCardMapper.selectPage(page, queryWrapper));
+ queryWrapper.orderByDesc(MemberCard::getCreateDate);
+
+ //鏄惁鏄暟瀛�
+ boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈涓枃
+ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈鑻辨枃
+ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
+
+ queryWrapper.leftJoin(Member.class,Member::getId,MemberCard::getMemberId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.selectAll(MemberCard.class)
+ .selectAs(Member::getName,MemberCard::getMemberName)
+ .selectAs(Member::getPhone,MemberCard::getMemberPhone)
+ .selectAs(Company::getName,MemberCard::getCompanyName);
+ queryWrapper.like(Objects.nonNull(pageWrap.getModel().getCode()),MemberCard::getCode,pageWrap.getModel().getCode())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
+ .like(number,Member::getPhone,pageWrap.getModel().getKeyWords())
+ .like((b||hasWord),Member::getName,pageWrap.getModel().getKeyWords());
+ IPage<MemberCard> memberCardIPage = memberCardJoinMapper.selectJoinPage(page, MemberCard.class,queryWrapper);
+ return PageData.from(memberCardIPage);
}
@Override
--
Gitblit v1.9.3