From 09b8882191667912dd58b4840e0848a27c4e65f0 Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期五, 15 十二月 2023 10:59:54 +0800
Subject: [PATCH] 员工列表
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java | 101 ++++++++++++++------------------------------------
1 files changed, 29 insertions(+), 72 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
index a49f837..95e889d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
@@ -2,19 +2,26 @@
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.admin.response.MemberInfoDTO;
import com.doumee.dao.business.ParksMapper;
+import com.doumee.dao.business.join.ParksJoinMapper;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Parks;
import com.doumee.service.business.ParksService;
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.apache.commons.lang3.StringUtils;
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;
/**
* 鍋滆溅搴撲俊鎭〃Service瀹炵幇
@@ -26,6 +33,10 @@
@Autowired
private ParksMapper parksMapper;
+
+ @Autowired
+ private ParksJoinMapper parksJoinMapper;
+
@Override
public Integer create(Parks parks) {
@@ -80,83 +91,29 @@
@Override
public List<Parks> findList(Parks parks) {
- QueryWrapper<Parks> wrapper = new QueryWrapper<>(parks);
- return parksMapper.selectList(wrapper);
+ MPJLambdaWrapper<Parks> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.isNull(Parks::getParentHkId);
+ queryWrapper.eq(Parks::getIsdeleted,Constants.ZERO);
+ queryWrapper.orderByDesc(Parks::getCreateDate);
+ return parksMapper.selectList(queryWrapper);
}
@Override
public PageData<Parks> findPage(PageWrap<Parks> pageWrap) {
IPage<Parks> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Parks> queryWrapper = new QueryWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(Parks::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(Parks::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(Parks::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(Parks::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEdirot() != null) {
- queryWrapper.lambda().eq(Parks::getEdirot, pageWrap.getModel().getEdirot());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(Parks::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(Parks::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(Parks::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(Parks::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Parks::getName, pageWrap.getModel().getName());
- }
- if (pageWrap.getModel().getHkId() != null) {
- queryWrapper.lambda().eq(Parks::getHkId, pageWrap.getModel().getHkId());
- }
- if (pageWrap.getModel().getHkStatus() != null) {
- queryWrapper.lambda().eq(Parks::getHkStatus, pageWrap.getModel().getHkStatus());
- }
- if (pageWrap.getModel().getHkDate() != null) {
- queryWrapper.lambda().ge(Parks::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
- queryWrapper.lambda().le(Parks::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
- }
- if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(Parks::getSortnum, pageWrap.getModel().getSortnum());
- }
- if (pageWrap.getModel().getParkCreateDate() != null) {
- queryWrapper.lambda().ge(Parks::getParkCreateDate, Utils.Date.getStart(pageWrap.getModel().getParkCreateDate()));
- queryWrapper.lambda().le(Parks::getParkCreateDate, Utils.Date.getEnd(pageWrap.getModel().getParkCreateDate()));
- }
- if (pageWrap.getModel().getParentHkId() != null) {
- queryWrapper.lambda().eq(Parks::getParentHkId, pageWrap.getModel().getParentHkId());
- }
- if (pageWrap.getModel().getParkEditDate() != null) {
- queryWrapper.lambda().ge(Parks::getParkEditDate, Utils.Date.getStart(pageWrap.getModel().getParkEditDate()));
- queryWrapper.lambda().le(Parks::getParkEditDate, Utils.Date.getEnd(pageWrap.getModel().getParkEditDate()));
- }
- if (pageWrap.getModel().getErpStatus() != null) {
- queryWrapper.lambda().eq(Parks::getErpStatus, pageWrap.getModel().getErpStatus());
- }
- if (pageWrap.getModel().getErpDate() != null) {
- queryWrapper.lambda().ge(Parks::getErpDate, Utils.Date.getStart(pageWrap.getModel().getErpDate()));
- queryWrapper.lambda().le(Parks::getErpDate, Utils.Date.getEnd(pageWrap.getModel().getErpDate()));
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(Parks::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(parksMapper.selectPage(page, queryWrapper));
+ MPJLambdaWrapper<Parks> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Parks.class);
+ queryWrapper.select(" p.name as parentName");
+
+ queryWrapper.leftJoin(" parks p on p.id=t.PARENT_HK_ID");
+
+ queryWrapper.isNotNull(Parks::getParentHkId);
+ queryWrapper.eq(Parks::getIsdeleted, Constants.ZERO);
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Parks::getName,pageWrap.getModel().getName());
+ queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getParentHkId()),Parks::getName,pageWrap.getModel().getParentHkId());
+ queryWrapper.orderByDesc(Parks::getCreateDate);
+ IPage<Parks> result = parksJoinMapper.selectJoinPage(page, Parks.class,queryWrapper);
+ return PageData.from(result);
}
@Override
--
Gitblit v1.9.3