From c72c6591a15800e1e75fdc9c08f4f427ff60ba69 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 17 七月 2024 10:07:42 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java | 118 ++++++++--------------------------------------------------
1 files changed, 17 insertions(+), 101 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
index 41dacb0..31792c8 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
@@ -2,21 +2,22 @@
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.CustomerLogMapper;
-import com.doumee.dao.business.model.CustomerLog;
-import com.doumee.dao.business.model.IamInterfaceLog;
-import com.doumee.dao.business.model.InterfaceLog;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.CustomerLogService;
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瀹炵幇
@@ -89,106 +90,21 @@
@Override
public PageData<CustomerLog> findPage(PageWrap<CustomerLog> pageWrap) {
IPage<CustomerLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<CustomerLog> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<CustomerLog> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(CustomerLog::getId, pageWrap.getModel().getId());
+ queryWrapper.selectAll(CustomerLog.class)
+ .leftJoin(Customer.class,Customer::getId,CustomerLog::getCostomerId)
+ .eq(CustomerLog::getIsdeleted, Constants.ZERO)
+ .eq(Objects.nonNull(pageWrap.getModel().getType()),CustomerLog::getType, pageWrap.getModel().getType())
+ .eq(Objects.nonNull(pageWrap.getModel().getMemberId()),Customer::getMemberId, pageWrap.getModel().getMemberId());
+ queryWrapper.orderByDesc(CustomerLog::getCreateDate);
+ PageData<CustomerLog> pageData = PageData.from(customerLogMapper.selectJoinPage(page,CustomerLog.class, queryWrapper));
+ for (CustomerLog customerLog:pageData.getRecords()) {
+ customerLog.setPhone(
+ customerLog.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")
+ );
}
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(CustomerLog::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(CustomerLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(CustomerLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(CustomerLog::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(CustomerLog::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(CustomerLog::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(CustomerLog::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(CustomerLog::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getOrderDate() != null) {
- queryWrapper.lambda().eq(CustomerLog::getOrderDate, pageWrap.getModel().getOrderDate());
- }
- if (pageWrap.getModel().getPlaDate() != null) {
- queryWrapper.lambda().eq(CustomerLog::getPlaDate, pageWrap.getModel().getPlaDate());
- }
- if (pageWrap.getModel().getDesignType() != null) {
- queryWrapper.lambda().eq(CustomerLog::getDesignType, pageWrap.getModel().getDesignType());
- }
- if (pageWrap.getModel().getHouseStatus() != null) {
- queryWrapper.lambda().eq(CustomerLog::getHouseStatus, pageWrap.getModel().getHouseStatus());
- }
- if (pageWrap.getModel().getDistrict() != null) {
- queryWrapper.lambda().eq(CustomerLog::getDistrict, pageWrap.getModel().getDistrict());
- }
- if (pageWrap.getModel().getArea() != null) {
- queryWrapper.lambda().eq(CustomerLog::getArea, pageWrap.getModel().getArea());
- }
- if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(CustomerLog::getInfo, pageWrap.getModel().getInfo());
- }
- if (pageWrap.getModel().getCostomerId() != null) {
- queryWrapper.lambda().eq(CustomerLog::getCostomerId, pageWrap.getModel().getCostomerId());
- }
- if (pageWrap.getModel().getHouseType() != null) {
- queryWrapper.lambda().eq(CustomerLog::getHouseType, pageWrap.getModel().getHouseType());
- }
- if (pageWrap.getModel().getSex() != null) {
- queryWrapper.lambda().eq(CustomerLog::getSex, pageWrap.getModel().getSex());
- }
- if (pageWrap.getModel().getAgeInfo() != null) {
- queryWrapper.lambda().eq(CustomerLog::getAgeInfo, pageWrap.getModel().getAgeInfo());
- }
- if (pageWrap.getModel().getStyleInfo() != null) {
- queryWrapper.lambda().eq(CustomerLog::getStyleInfo, pageWrap.getModel().getStyleInfo());
- }
- if (pageWrap.getModel().getProvinceName() != null) {
- queryWrapper.lambda().like(CustomerLog::getProvinceName, pageWrap.getModel().getProvinceName());
- }
- if (pageWrap.getModel().getCityName() != null) {
- queryWrapper.lambda().like(CustomerLog::getCityName, pageWrap.getModel().getCityName());
- }
- if (pageWrap.getModel().getProvicneCode() != null) {
- queryWrapper.lambda().eq(CustomerLog::getProvicneCode, pageWrap.getModel().getProvicneCode());
- }
- if (pageWrap.getModel().getCityCode() != null) {
- queryWrapper.lambda().eq(CustomerLog::getCityCode, pageWrap.getModel().getCityCode());
- }
- if (pageWrap.getModel().getPhone() != null) {
- queryWrapper.lambda().like(CustomerLog::getPhone, pageWrap.getModel().getPhone());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(CustomerLog::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getBudget() != null) {
- queryWrapper.lambda().eq(CustomerLog::getBudget, pageWrap.getModel().getBudget());
- }
- if (pageWrap.getModel().getCrmStatus() != null) {
- queryWrapper.lambda().eq(CustomerLog::getCrmStatus, pageWrap.getModel().getCrmStatus());
- }
- if (pageWrap.getModel().getCrmDate() != null) {
- queryWrapper.lambda().ge(CustomerLog::getCrmDate, Utils.Date.getStart(pageWrap.getModel().getCrmDate()));
- queryWrapper.lambda().le(CustomerLog::getCrmDate, Utils.Date.getEnd(pageWrap.getModel().getCrmDate()));
- }
- if (pageWrap.getModel().getCrmInfo() != null) {
- queryWrapper.lambda().eq(CustomerLog::getCrmInfo, pageWrap.getModel().getCrmInfo());
- }
- if (pageWrap.getModel().getQueryStartDate() != null) {
- queryWrapper.lambda().ge(CustomerLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getQueryStartDate()));
- }
- if (pageWrap.getModel().getQueryEndDate() != null) {
- queryWrapper.lambda().le(CustomerLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getQueryEndDate()));
- }
- queryWrapper.lambda().orderByDesc(CustomerLog::getCreateDate);
- return PageData.from(customerLogMapper.selectPage(page, queryWrapper));
+ return pageData;
}
@Override
--
Gitblit v1.9.3