From e76eb20e6c3818e13a598b7f0f4d22a090832fd4 Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期三, 13 十二月 2023 15:40:52 +0800
Subject: [PATCH] 员工列表
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 294 insertions(+), 5 deletions(-)
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 cf8d0fe..0de6db9 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
@@ -1,25 +1,59 @@
package com.doumee.service.business.impl;
+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;
+import com.doumee.config.Jwt.JwtTokenUtil;
+import com.doumee.core.annotation.excel.ExcelImporter;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.utils.Utils;
+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.model.Member;
+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;
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.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.util.CollectionUtils;
-
+import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 浜哄憳淇℃伅琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class MemberServiceImpl implements MemberService {
@@ -27,10 +61,77 @@
@Autowired
private MemberMapper memberMapper;
+ @Autowired
+ private MemberJoinMapper memberJoinMapper;
+
+ @Autowired
+ private TrainTimeMapper trainTimeMapper;
+
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
@Override
public Integer create(Member member) {
memberMapper.insert(member);
return member.getId();
+ }
+
+ @Transactional
+ @Override
+ public Integer laborMemberCreate(LaborMemberDTO member) {
+
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ if (PhoneUtil.isPhone(member.getPhone())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
+ }
+ if (IdcardUtil.isValidCard(member.getIdcardNo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
+ }
+ if (IdcardUtil.getGenderByIdCard(member.getIdcardNo()) == member.getSex()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎬у埆鏈夎");
+ }
+ //鑾峰彇鍑虹敓鏃ユ湡
+ String birthByIdCard = IdcardUtil.getBirthByIdCard(member.getIdcardNo());
+ //鑴辨晱鎿嶄綔
+ String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
+ //杞崲鏃ユ湡
+ DateTime yyyyMMdd = DateUtil.parse(birthByIdCard, "yyyyMMdd");
+
+ Member insert = new Member();
+ insert.setCreator(loginUserInfo.getId());
+ insert.setCreateDate(new Date());
+ insert.setEditor(loginUserInfo.getId());
+ insert.setEditDate(new Date());
+ insert.setIsdeleted(Constants.ZERO);
+ insert.setCompanyId(member.getCompanyId());
+ insert.setFaceImg(member.getFaceImg());
+ insert.setImgurl(member.getImgurl());
+ insert.setType(Constants.ZERO);
+ insert.setName(member.getName());
+ insert.setBirthday(yyyyMMdd);
+ insert.setPhone(member.getPhone());
+ insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
+ IdcardUtil.isValidCard(member.getIdcardNo());
+ insert.setIdcardDecode(hide);
+ insert.setStatus(Constants.ZERO);
+ insert.setParentId(member.getParentId());
+ memberMapper.insert(insert);
+
+ TrainTime trainTime = new TrainTime();
+ trainTime.setCreator(loginUserInfo.getId().toString());
+ trainTime.setCreateDate(new Date());
+ trainTime.setEdirot(loginUserInfo.getId().toString());
+ trainTime.setEditDate(new Date());
+ trainTime.setIsdeleted(Constants.ZERO);
+ trainTime.setMemberId(insert.getId());
+ trainTime.setStartTime(Utils.Date.getStart(member.getStartTime()));
+ trainTime.setEndTime(Utils.Date.getDayEnd(member.getEndTime()));
+// trainTime.setImportStatus();
+// trainTime.setImportInfo();
+ trainTimeMapper.insert(trainTime);
+ return insert.getId();
}
@Override
@@ -55,6 +156,27 @@
@Override
public void updateById(Member member) {
memberMapper.updateById(member);
+ }
+
+ @Override
+ public void updateStatusById(Member member) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Member update = new Member();
+ update.setEditDate(new Date());
+ update.setEditor(loginUserInfo.getId());
+ update.setStatus(member.getStatus());
+ 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
@@ -83,9 +205,10 @@
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
return memberMapper.selectList(wrapper);
}
-
+
@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());
@@ -207,6 +330,13 @@
if (pageWrap.getModel().getRoleId() != null) {
queryWrapper.lambda().eq(Member::getRoleId, pageWrap.getModel().getRoleId());
}
+ if (pageWrap.getModel().getRoleDate() != null) {
+ queryWrapper.lambda().ge(Member::getRoleDate, Utils.Date.getStart(pageWrap.getModel().getRoleDate()));
+ queryWrapper.lambda().le(Member::getRoleDate, Utils.Date.getEnd(pageWrap.getModel().getRoleDate()));
+ }
+ if (pageWrap.getModel().getErpOrgId() != null) {
+ queryWrapper.lambda().eq(Member::getErpOrgId, pageWrap.getModel().getErpOrgId());
+ }
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -218,8 +348,167 @@
}
@Override
+ public PageData<MemberInfoDTO> findLaborMemberInfoPage(PageWrap<MemberInfoDTO> pageWrap) {
+ IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ MemberInfoDTO model = pageWrap.getModel();
+ Utils.MP.blankToNull(model);
+ Date end = Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime());
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .leftJoin(TrainTime.class,TrainTime::getMemberId,Member::getId)
+ .leftJoin(Empower.class,Empower::getMemberId,Member::getId);
+
+ queryWrapper.selectAll(Member.class)
+ .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
+ .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName)
+ .select("Max(t1.endTime)","trainTimeEndTime")
+ .select("Max(t2.endTime)","empowerEndTime");
+
+ queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
+ .like(StringUtils.isNotBlank(model.getName()),Member::getName,model.getName())
+ .like(StringUtils.isNotBlank(model.getPhone()),Member::getPhone,model.getPhone())
+ .like(StringUtils.isNotBlank(model.getIdcardDecode()),Member::getIdcardDecode,model.getIdcardDecode())
+ .having("trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
+ 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);
+ }
+
+ @Override
public long count(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
return memberMapper.selectCount(wrapper);
}
+
+ @Override
+ public void importMemberBatch(LaborEmpowerDTO laborEmpowerDTO) {
+ try {
+ ExcelImporter ie = new ExcelImporter(laborEmpowerDTO.getFile(),0,0);
+
+ List<LaborEmpowerDTO.LaborMemberEmpower> dataList = ie.getDataList(LaborEmpowerDTO.LaborMemberEmpower.class,null);
+
+ if (CollectionUtils.isEmpty(dataList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂囦欢鏃犳暟鎹褰�");
+ }
+
+ } catch (Exception e) {
+
+ }
+//
+
+ }
+
+ @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 ");*//*
+ .select("");
+
+ queryWrapper.in(Objects.nonNull(model.getCompanyIds()),Member::getCompanyId,model.getCompanyIds())
+ *//* .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())
+ .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())));
+ }*/
+ 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);
+ }
+
+ /********************************************鍏紬鍙锋帴鍙�***********************************************************************/
+
+
+
+ /**
+ * 寰俊鎺堟潈鎺ュ彛
+ * @param code
+ * @return
+ */
+ @Override
+ public WxAuthorizeVO wxAuthorize(String code){
+ String appId = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode();
+ String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode();
+ String getTokenUrl = WXConstant.GET_USER_INFO_URL.replace("CODE", code)
+ .replace("APPID", appId).replace("SECRET", appSecret);
+ JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
+ String openId = null;
+ if(!Objects.isNull(tokenJson.get("access_token"))){
+ openId = tokenJson.getString("openid");
+ }
+ WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
+ wxAuthorizeVO.setOpenid(openId);
+ return wxAuthorizeVO;
+ }
+
+
+ @Override
+ public MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO){
+ Integer validType = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.BEVISITED_USER_VALID).getCode());
+ if(Objects.isNull(checkVisitedDTO)||StringUtils.isBlank(checkVisitedDTO.getMobile())||(validType.equals(Constants.ONE)&&StringUtils.isBlank(checkVisitedDTO.getName()))){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+ .eq(Member::getPhone,checkVisitedDTO.getMobile())
+ .eq(validType.equals(Constants.ONE),Member::getName,checkVisitedDTO.getName())
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .eq(Member::getStatus,Constants.ZERO)
+ .eq(Member::getCanVisit,Constants.ONE)
+ .eq(Member::getType,Constants.memberType.internal)
+ .last(" limit 1 ")
+ );
+ MemberVO memberVO = new MemberVO();
+ BeanUtils.copyProperties(member,memberVO);
+ return memberVO;
+ }
+
+
+
+
+
+
+
+
+
+
+
}
--
Gitblit v1.9.3