From 30a14783481d100a6503a56c902b47182e542c93 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 08 十二月 2023 15:42:09 +0800
Subject: [PATCH] #组织树 和企业下的人员信息 人员卡信息
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberCardJoinMapper.java | 13 +
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java | 36 ++++-
server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java | 8 +
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 79 +++++++---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 44 +++++
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 9 +
server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java | 15 ++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 43 ++++++
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java | 13 +
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CompanyDTO.java | 58 ++++++++
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 32 ++++
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 15 ++
12 files changed, 326 insertions(+), 39 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
index 122e391..41cca71 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.model.Company;
import com.doumee.service.business.CompanyService;
import io.swagger.annotations.Api;
@@ -107,4 +108,18 @@
company.setCategoryId(query.getCategoryId());
return ApiResponse.success(companyService.findList(company));
}
+
+
+ /**
+ * 鏌ヨ閮ㄩ棬鍙婂叾瀛愰儴闂ㄤ俊鎭�
+ * @param type 0 鏌ヨ鎵�鏈変俊鎭� 1 鏌ヨ鍐呴儴淇℃伅
+ * @return
+ */
+ @ApiOperation("鏍规嵁绫诲瀷鏌ヨ缁勭粐淇℃伅")
+ @GetMapping("/findCompanyTreePage")
+// @RequiresPermissions("business:company:query")
+ public ApiResponse<List<CompanyDTO>> findCompanyTreePage(Integer type){
+ return ApiResponse.success(companyService.findCompanyTreePage(type));
+ }
+
}
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 ba74171..9fc2c03 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
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.admin.request.LaborMemberDTO;
+import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.MemberService;
@@ -112,4 +113,18 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(memberService.findById(id));
}
+
+
+ /**
+ *
+ * 鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅
+ * @param pageWrap
+ * @return
+ */
+ @ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
+ @GetMapping("/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
new file mode 100644
index 0000000..7aa751c
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
@@ -0,0 +1,32 @@
+package com.doumee.dao.admin.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("浜哄憳鏌ヨ 鍙傛暟")
+public class MemberQuery {
+
+ @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
+ private String keyWords;
+
+ @ApiModelProperty(value = "鏄惁鏈変汉鑴� 0 鍚� 1 鏄�")
+ private Integer hasFace;
+
+ @ApiModelProperty(value = "鍙嫓璁�")
+ private Integer canVisit;
+
+ @ApiModelProperty(value = "鐘舵��")
+ private Integer status;
+
+ @ApiModelProperty(value = "鍏徃IDs")
+ private List<Integer> companyIds;
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CompanyDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CompanyDTO.java
new file mode 100644
index 0000000..b9efaad
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CompanyDTO.java
@@ -0,0 +1,58 @@
+package com.doumee.dao.admin.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("缁勭粐妯″瀷")
+public class CompanyDTO {
+
+
+ @ApiModelProperty(value = "鍚嶇О")
+ private String name;
+
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
+ private Integer status;
+
+ @ApiModelProperty(value = "鎺掑簭鐮�")
+ private Integer sortnum;
+
+ @ApiModelProperty(value = "鍔冲姟浜烘暟")
+ private Integer countNum;
+
+ @ApiModelProperty(value = "鍥炬爣")
+ private String imgurl;
+
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
+ private Integer type;
+
+ @ApiModelProperty(value = "鍒嗙被缂栫爜(鍏宠仈category)")
+ private Integer categoryId;
+
+ @ApiModelProperty(value = "鍒嗙被缂栫爜鍚嶇О")
+ private String categoryName;
+
+ @ApiModelProperty(value = "浼佷笟浠ｇ爜")
+ private Integer code;
+
+ @ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
+ private Integer parentId;
+
+ @ApiModelProperty(value = "鑱旂郴浜哄鍚�")
+ private String linkName;
+
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ private String linkPhone;
+
+ @ApiModelProperty(value = "瀛愰儴闂�")
+ private List<CompanyDTO> companyDTOList;
+}
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 45cdff7..6328ae1 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
@@ -82,6 +82,19 @@
@ApiModelProperty(value = "寰俊openid")
private String openid;
+ @ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜")
+ private Integer roleId;
+
+ @ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
+ private String roleName;
+
+ @ApiModelProperty(value = "鏄惁鍙嫓璁夸汉 0鍚� 1鏄�")
+ private String canVisit;
+
+
+ @ApiModelProperty(value = "鍗＄墖鏁�")
+ private Integer memberCardCount;
+
@ApiModelProperty(value = "鍩硅鏈夋晥鏈熺粨鏉熸椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date trainTimeEndTime;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberCardJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberCardJoinMapper.java
new file mode 100644
index 0000000..8e31748
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberCardJoinMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.DeviceEvent;
+import com.doumee.dao.business.model.MemberCard;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@Repository
+public interface MemberCardJoinMapper extends MPJJoinMapper<MemberCard> {
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
index 214b280..86ee196 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,11 +22,11 @@
public class MemberCard {
@TableId(type = IdType.AUTO)
- @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ApiModelProperty(value = "涓婚敭")
@ExcelColumn(name="涓婚敭")
private Integer id;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@@ -34,7 +35,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@@ -43,7 +44,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
- @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@@ -51,9 +52,24 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛�)", example = "1")
+ @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛�)")
@ExcelColumn(name="鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛�)")
private Integer memberId;
+
+ @ApiModelProperty(value = "鐢ㄦ埛缂栫爜鍚嶇О")
+ @ExcelColumn(name="鐢ㄦ埛缂栫爜鍚嶇О")
+ @TableField(exist = false)
+ private String memberName;
+
+ @ApiModelProperty(value = "鐢ㄦ埛鐢佃瘽")
+ @ExcelColumn(name="鐢ㄦ埛鐢佃瘽")
+ @TableField(exist = false)
+ private String memberPhone;
+
+ @ApiModelProperty(value = "鍏徃缁勭粐鍚嶇О")
+ @ExcelColumn(name="鍏徃缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
@ApiModelProperty(value = "鍗″彿")
@ExcelColumn(name="鍗″彿")
@@ -63,11 +79,11 @@
@ExcelColumn(name="鍗″瘑")
private String passward;
- @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
+ @ApiModelProperty(value = "娴峰悍鏍囪瘑")
@ExcelColumn(name="娴峰悍鏍囪瘑")
private String hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer hkStatus;
@@ -76,8 +92,12 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
- @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤")
@ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
private Integer status;
+
+ @ApiModelProperty(value = "鍏抽敭瀛�")
+ @TableField(exist = false)
+ private String KeyWords;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
index 4909605..335e038 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
@@ -2,6 +2,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.model.Company;
import java.util.List;
@@ -110,4 +111,11 @@
* @return long
*/
long count(Company company);
+
+ /**
+ * 鏌ヨ閮ㄩ棬鍙婂叾瀛愰儴闂ㄤ俊鎭�
+ * @param type 0 鏌ヨ鎵�鏈変俊鎭� 1 鏌ヨ鍐呴儴淇℃伅
+ * @return
+ */
+ List<CompanyDTO> findCompanyTreePage(Integer type);
}
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 8a281a4..5078d2c 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
@@ -5,6 +5,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
+import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.response.WxAuthorizeVO;
@@ -136,6 +137,14 @@
void importMemberBatch(LaborEmpowerDTO laborEmpowerDTO);
+ /**
+ *
+ * 鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅
+ * @param pageWrap
+ * @return
+ */
+ PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);
+
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 5958cf0..484823e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -7,6 +9,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Category;
@@ -18,13 +21,18 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.collections.CollectionUtils;
import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 浼佷笟淇℃伅琛⊿ervice瀹炵幇
@@ -245,6 +253,41 @@
return companyMapper.selectCount(wrapper);
}
+
+ @Override
+ public List<CompanyDTO> findCompanyTreePage(Integer type) {
+
+ LambdaQueryWrapper<Company> wrapper = new LambdaQueryWrapper<>();
+
+ wrapper.eq(Company::getIsdeleted,Constants.ZERO)
+ .eq(Constants.equalsInteger(type,Constants.ONE),Company::getType,type);
+ List<Company> companies = companyMapper.selectList(wrapper);
+ return getCompanyTree( companies, null);
+ }
+
+
+ private List<CompanyDTO> getCompanyTree(List<Company> companies, Integer parentId){
+ if (CollectionUtils.isEmpty(companies)){
+ return null;
+ }
+ List<Company> collect = companies.stream()
+ .filter(s -> Constants.equalsInteger(s.getParentId(), parentId))
+ .collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(companies)){
+ return null;
+ }
+ List<CompanyDTO> companyDTOList = new ArrayList<>();
+ for (int i = 0; i < collect.size(); i++) {
+ Company company = collect.get(i);
+ CompanyDTO companyDTO = new CompanyDTO();
+ BeanUtils.copyProperties(company,companyDTO);
+ companyDTO.setCompanyDTOList(getCompanyTree(companies, company.getId()));
+ companyDTOList.add(companyDTO);
+ }
+ return companyDTOList;
+ }
+
+
/**
* 鍔冲姟鍏徃鍞竴鎬ф牎楠�
* @param company
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index 6ab53c2..58a2b9c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -1,20 +1,28 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.lang.PatternPool;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ReUtil;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberCardMapper;
+import com.doumee.dao.business.join.MemberCardJoinMapper;
+import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberCard;
import com.doumee.service.business.MemberCardService;
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瀹炵幇
@@ -26,6 +34,9 @@
@Autowired
private MemberCardMapper memberCardMapper;
+
+ @Autowired
+ private MemberCardJoinMapper memberCardJoinMapper;
@Override
public Integer create(MemberCard memberCard) {
@@ -83,65 +94,79 @@
QueryWrapper<MemberCard> wrapper = new QueryWrapper<>(memberCard);
return memberCardMapper.selectList(wrapper);
}
-
+
@Override
public PageData<MemberCard> findPage(PageWrap<MemberCard> pageWrap) {
IPage<MemberCard> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<MemberCard> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<MemberCard> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(MemberCard::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(MemberCard::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(MemberCard::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(MemberCard::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(MemberCard::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(MemberCard::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(MemberCard::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(MemberCard::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(MemberCard::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(MemberCard::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(MemberCard::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(MemberCard::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(MemberCard::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(MemberCard::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(MemberCard::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(MemberCard::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(MemberCard::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(MemberCard::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(MemberCard::getMemberId, pageWrap.getModel().getMemberId());
+ queryWrapper.eq(MemberCard::getMemberId, pageWrap.getModel().getMemberId());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(MemberCard::getCode, pageWrap.getModel().getCode());
+ queryWrapper.eq(MemberCard::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getPassward() != null) {
- queryWrapper.lambda().eq(MemberCard::getPassward, pageWrap.getModel().getPassward());
+ queryWrapper.eq(MemberCard::getPassward, pageWrap.getModel().getPassward());
}
if (pageWrap.getModel().getHkId() != null) {
- queryWrapper.lambda().eq(MemberCard::getHkId, pageWrap.getModel().getHkId());
+ queryWrapper.eq(MemberCard::getHkId, pageWrap.getModel().getHkId());
}
if (pageWrap.getModel().getHkStatus() != null) {
- queryWrapper.lambda().eq(MemberCard::getHkStatus, pageWrap.getModel().getHkStatus());
+ queryWrapper.eq(MemberCard::getHkStatus, pageWrap.getModel().getHkStatus());
}
if (pageWrap.getModel().getHkDate() != null) {
- queryWrapper.lambda().ge(MemberCard::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
- queryWrapper.lambda().le(MemberCard::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
+ queryWrapper.ge(MemberCard::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
+ queryWrapper.le(MemberCard::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(MemberCard::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(MemberCard::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(memberCardMapper.selectPage(page, queryWrapper));
+ queryWrapper.orderByDesc(MemberCard::getCreateDate);
+
+ //鏄惁鏄暟瀛�
+ boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈涓枃
+ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈鑻辨枃
+ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
+
+ queryWrapper.leftJoin(Member.class,Member::getId,MemberCard::getMemberId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.selectAll(MemberCard.class)
+ .selectAs(Member::getName,MemberCard::getMemberName)
+ .selectAs(Member::getPhone,MemberCard::getMemberPhone)
+ .selectAs(Company::getName,MemberCard::getCompanyName);
+ queryWrapper.like(Objects.nonNull(pageWrap.getModel().getCode()),MemberCard::getCode,pageWrap.getModel().getCode())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
+ .like(number,Member::getPhone,pageWrap.getModel().getKeyWords())
+ .like((b||hasWord),Member::getName,pageWrap.getModel().getKeyWords());
+ IPage<MemberCard> memberCardIPage = memberCardJoinMapper.selectJoinPage(page, MemberCard.class,queryWrapper);
+ return PageData.from(memberCardIPage);
}
@Override
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 fd71f8c..359e435 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
@@ -2,8 +2,11 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.PatternPool;
+import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.PhoneUtil;
+import cn.hutool.core.util.ReUtil;
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.Jwt.JwtPayLoad;
@@ -20,14 +23,12 @@
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
+import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.TrainTimeMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
-import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.Empower;
-import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.TrainTime;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.web.response.WxAuthorizeVO;
import com.doumee.service.business.MemberService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -383,8 +384,43 @@
}
+ @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());
+ 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);
+
+ queryWrapper.selectAll(Member.class)
+ .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
+ .selectAs(DeviceRole::getName,MemberInfoDTO::getRoleName)
+ .select("count(t3.id) as memberCardCount ");
+
+ queryWrapper.in(Objects.nonNull(model.getCompanyIds()),Member::getCompanyId,model.getCompanyIds())
+ .like(number,Member::getPhone,model.getKeyWords())
+ .like((b||hasWord),Member::getPhone,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())
+ .eq(Objects.nonNull(model.getStatus()),Member::getStatus,model.getStatus());
+ IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
+ memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));
+ }
+ return PageData.from(memberIPage);
+ }
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
--
Gitblit v1.9.3