From 31933f572488dbf7af07067a97ea18a66ec13a8c Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期五, 15 十二月 2023 09:09:00 +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/MemberServiceImpl.java | 27 +++++++++++++++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 3 ++-
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 2 ++
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarJoinMapper.java | 7 +++++++
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 3 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 5 -----
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 8 ++++++++
8 files changed, 50 insertions(+), 7 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_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index e4eb4d3..69790af 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -151,4 +151,12 @@
return ApiResponse.success(memberService.findVisitPage(pageWrap));
}
+
+ @ApiOperation("寮傚父浜哄憳")
+ @PostMapping("/findUnusualPage")
+ @RequiresPermissions("business:member:query")
+ public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
+ return ApiResponse.success(memberService.findUnusualPage(pageWrap));
+ }
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
index 73e6cc5..4949a87 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -249,7 +249,8 @@
/** 鐢ㄦ埛鍚敤绂佺敤鏋氫妇鍊�*/
ENABLE(0,"姝ｅ父"),
- DISABLE(1,"绂佺敤");
+ DISABLE(1,"绂佺敤"),
+ FREEZE(2,"鎷夐粦/鍐荤粨");
private Integer value;
private String des;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
index b7ef45b..e35b43f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
@@ -42,5 +42,8 @@
@ApiModelProperty(value = "韬唤璇佸彿")
private String idcardNo;
+ @ApiModelProperty(value = " 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
+ private Integer type;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarJoinMapper.java
new file mode 100644
index 0000000..db544b7
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarJoinMapper.java
@@ -0,0 +1,7 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.Cars;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+public interface CarJoinMapper extends MPJJoinMapper<Cars> {
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index 55b51c1..7f95229 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -153,6 +153,8 @@
PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap);
+ PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> 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 fa224c3..dcb60df 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
@@ -99,11 +99,6 @@
@Override
public PageData<Cars> findPage(PageWrap<Cars> pageWrap) {
- MPJLambdaWrapper<Cars> visRecord = new MPJLambdaWrapper<>();
- visRecord.selectAll(Cars.class);
- visRecord.eq(Cars::getIsdeleted, Constants.ZERO);
- visRecord.eq(Cars::getId, Constants.ZERO);
- Cars result = carJoinMapper.selectJoinOne(Cars.class,visRecord);
IPage<Cars> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Cars> queryWrapper = new QueryWrapper<>();
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 8bdd4a9..dae492d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -516,6 +516,33 @@
.like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
.like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
+ .eq(Member::getStatus,Constants.Status.FREEZE)
+ .orderByDesc(Member::getCreateDate);
+
+
+ IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ return PageData.from(memberIPage);
+
+ }
+
+
+ @Override
+ public PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
+
+
+ IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.selectAll(Member.class)
+ .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
+ .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0) as visitsCount")
+ .select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 order by CREATE_DATE limit 1) as visitsLastDate");
+
+ queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Member::getType,pageWrap.getModel().getType());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
.eq(Member::getStatus,Constants.Status.ENABLE)
.orderByDesc(Member::getCreateDate);
--
Gitblit v1.9.3