From a0ade3c35b7413054e642429229c5e65ac21f4ca Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期三, 13 十二月 2023 13:58:48 +0800
Subject: [PATCH] 员工列表
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 52 +++++++++++++++++++++-----
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 1
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java | 3 +
server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java | 16 ++++++++
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 3 +
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 12 +++++-
7 files changed, 74 insertions(+), 15 deletions(-)
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 9fc2c03..07d58fd 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
@@ -86,6 +86,14 @@
return ApiResponse.success(null);
}
+ @ApiOperation("鏄惁鍙嫓璁跨姸鎬佷慨鏀�")
+ @PostMapping("/updateCanVisitById")
+ @RequiresPermissions("business:member:update")
+ public ApiResponse updateCanVisitById(@RequestBody Member member){
+ memberService.updateCanVisitById(member);
+ return ApiResponse.success(null);
+ }
+
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:member:query")
@@ -122,8 +130,8 @@
* @return
*/
@ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
- @GetMapping("/findMemberInfoPage")
- @RequiresPermissions("business:member:query")
+ @PostMapping("/findMemberInfoPage")
+ // @RequiresPermissions("business:member:query")
public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
}
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 7aa751c..29b75cc 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
@@ -5,6 +5,7 @@
import io.swagger.models.auth.In;
import lombok.Data;
+import java.io.Serializable;
import java.util.List;
/**
@@ -12,7 +13,7 @@
*/
@Data
@ApiModel("浜哄憳鏌ヨ 鍙傛暟")
-public class MemberQuery {
+public class MemberQuery implements Serializable {
@ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
private String keyWords;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
index 6328ae1..42563f5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
import java.util.Date;
/**
@@ -13,7 +14,7 @@
*/
@Data
@ApiModel("鍔冲姟浜哄憳淇℃伅琛�")
-public class MemberInfoDTO {
+public class MemberInfoDTO implements Serializable {
@ApiModelProperty(value = "涓婚敭")
private Integer id;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
index ebb6e19..b758023 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
@@ -1,7 +1,13 @@
package com.doumee.dao.business;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
/**
* @author 姹熻箘韫�
@@ -9,4 +15,14 @@
*/
public interface MemberMapper extends BaseMapper<Member> {
+
+ @Select(" select m.* , c.name as companyName , d.name as roleName, " +
+ " (select count(0) from member_card mc where mc.MEMBER_ID=m.id and mc.ISDELETED=0) as memberCardCount " +
+ " from member m " +
+ " left join company c on m.COMPANY_ID=c.id "+
+ " left join device_role d on d.id=m.ROLE_ID "+
+ " ${ew.customSqlSegment} ")
+ IPage<MemberInfoDTO> getPage(IPage<MemberInfoDTO> page, @Param(Constants.WRAPPER) Wrapper wrapper);
+
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index bcb9649..922f31e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -61,7 +61,7 @@
private String faceImg;
@ApiModelProperty(value = "浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
@ExcelColumn(name="浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
- private String faceServeIndexCode;
+ private String faceServerIndexCode;
@ApiModelProperty(value = "浜鸿劯缂栫爜锛堟捣搴凤級")
@ExcelColumn(name="浜鸿劯缂栫爜锛堟捣搴凤級")
private String faceId;
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 a14b747..75ae96d 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
@@ -73,6 +73,7 @@
*/
void updateStatusById(Member member);
+ void updateCanVisitById(Member member);
/**
* 鎵归噺涓婚敭鏇存柊
*
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 9a28a50..0ac6f16 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
@@ -29,6 +29,9 @@
import com.doumee.dao.business.TrainTimeMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.web.reqeust.CheckVisitedDTO;
+import com.doumee.dao.web.response.MemberVO;
import com.doumee.dao.web.response.WxAuthorizeVO;
import com.doumee.service.business.MemberService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -39,6 +42,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -164,6 +168,17 @@
memberMapper.updateById(update);
}
+
+ @Override
+ public void updateCanVisitById(Member member) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Member update = new Member();
+ update.setEditDate(new Date());
+ update.setEditor(loginUserInfo.getId());
+ update.setCanVisit(member.getCanVisit());
+ memberMapper.updateById(update);
+ }
+
@Override
public void updateByIdInBatch(List<Member> members) {
if (CollectionUtils.isEmpty(members)) {
@@ -193,6 +208,7 @@
@Override
public PageData<Member> findPage(PageWrap<Member> pageWrap) {
+
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Member> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
@@ -386,31 +402,35 @@
@Override
public PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
-
- //鏄惁鏄暟瀛�
+ /* //鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈涓枃
boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈鑻辨枃
- boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
+ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());*/
- IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ /* IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
MemberQuery model = pageWrap.getModel();
Utils.MP.blankToNull(model);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .leftJoin(DeviceRole.class,DeviceRole::getId,Member::getRoleId)
- .leftJoin(MemberCard.class,MemberCard::getMemberId,Member::getId);
+ .leftJoin(DeviceRole.class,DeviceRole::getId,Member::getRoleId);
+ *//* .leftJoin(MemberCard.class,MemberCard::getMemberId,Member::getId);*//*
queryWrapper.selectAll(Member.class)
.selectAs(Company::getName,MemberInfoDTO::getCompanyName)
.selectAs(DeviceRole::getName,MemberInfoDTO::getRoleName)
- .select("count(t3.id) as memberCardCount ");
+ *//* .select("count(t3.id) as memberCardCount ");*//*
+ .select("");
queryWrapper.in(Objects.nonNull(model.getCompanyIds()),Member::getCompanyId,model.getCompanyIds())
- .like(number,Member::getPhone,model.getKeyWords())
- .like((b||hasWord),Member::getPhone,model.getKeyWords())
+ *//* .like(number,Member::getPhone,model.getKeyWords())
+ .like((b||hasWord),Member::getPhone,model.getKeyWords())*//*
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),ms->ms.like(Member::getPhone,model.getKeyWords())
+ .or().like(Member::getName,model.getKeyWords())
+ .or().like(Member::getCode,model.getKeyWords()))
+
.isNull(Constants.equalsInteger(model.getHasFace(),Constants.ZERO),Member::getFaceId)
.isNotNull(Constants.equalsInteger(model.getHasFace(),Constants.ONE),Member::getFaceId)
.eq(Objects.nonNull(model.getCanVisit()),Member::getCanVisit,model.getCanVisit())
@@ -418,7 +438,19 @@
IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));
- }
+ }*/
+ IPage<MemberInfoDTO> memberIPage = memberMapper.getPage(pageWrap.toPage(),new QueryWrapper<MemberInfoDTO>()
+ .in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,"m.COMPANY_ID",pageWrap.getModel().getCompanyIds())
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),ms->ms.like("m.ohone",pageWrap.getModel().getKeyWords())
+ .or().like("m.name",pageWrap.getModel().getKeyWords())
+ .or().like("m.code",pageWrap.getModel().getKeyWords()))
+ .isNull(Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ZERO),"m.FACE_ID")
+ .isNotNull(Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ONE),"m.FACE_ID")
+ .eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),"m.CAN_VISIT",pageWrap.getModel().getCanVisit())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),"m.CAN_VISIT",pageWrap.getModel().getStatus())
+ .eq("m.ISDELETED",0)
+ .orderByDesc("m.CREATE_DATE")
+ );
return PageData.from(memberIPage);
}
--
Gitblit v1.9.3