From 7cfac23a7b290417504c77f165dc39577a5212e3 Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期五, 22 十二月 2023 16:16:57 +0800
Subject: [PATCH] 员工列表
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 8 ++++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 3 ++-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
index 5c38b14..3ea4554 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
@@ -69,7 +69,7 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- // @RequiresPermissions("business:cars:query")
+ @RequiresPermissions("business:cars:query")
public ApiResponse<PageData<Cars>> findPage (@RequestBody PageWrap<Cars> pageWrap) {
return ApiResponse.success(carsService.findPage(pageWrap));
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index 182e214..4a8efab 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -17,11 +17,13 @@
import com.doumee.dao.business.model.*;
import com.doumee.service.business.CarsService;
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;
/**
* 杞﹁締淇℃伅琛⊿ervice瀹炵幇
@@ -115,6 +117,12 @@
queryWrapper.leftJoin(Member.class,Member::getId,Cars::getMemberId);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+
+ queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
+ .or().like(Member::getPhone,pageWrap.getModel().getMemberName()));
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
+ queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberType()),Member::getType,pageWrap.getModel().getMemberType());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCode()),Cars::getCode,pageWrap.getModel().getCode());
queryWrapper.eq(Cars::getIsdeleted,Constants.ZERO);
queryWrapper.orderByDesc(Cars::getCreateDate);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index b6e3f46..e35fe39 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -595,8 +595,9 @@
queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.leftJoin(" member m on m.id=t.MEMBER_ID");
- queryWrapper.ne(Member::getType,Constants.TWO);
+ queryWrapper.ne("m.type ",Constants.TWO);
queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Visits::getType,pageWrap.getModel().getType());
queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getName()),ms->ms.like(Visits::getPhone,pageWrap.getModel().getName())
--
Gitblit v1.9.3