From be04a78ca5670dfbeb821bc42f95150447e251dd Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期三, 06 十二月 2023 09:20:24 +0800 Subject: [PATCH] #劳务人员禁启用 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 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 5e60a0b..8dca011 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 @@ -3,6 +3,8 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdcardUtil; +import cn.hutool.core.util.PhoneUtil; +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; @@ -10,6 +12,7 @@ import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; +import com.doumee.dao.admin.request.LaborEmpowerDTO; import com.doumee.dao.admin.request.LaborMemberDTO; import com.doumee.dao.admin.response.MemberInfoDTO; import com.doumee.dao.business.MemberMapper; @@ -25,13 +28,12 @@ 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.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - import java.util.Date; import java.util.List; import java.util.Objects; @@ -65,6 +67,9 @@ 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(),"韬唤璇佸彿鏍煎紡鏈夎"); } @@ -74,7 +79,7 @@ //鑾峰彇鍑虹敓鏃ユ湡 String birthByIdCard = IdcardUtil.getBirthByIdCard(member.getIdcardNo()); //鑴辨晱鎿嶄綔 - String hide = IdcardUtil.hide(member.getIdcardNo(), 6, 14); + String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14); //杞崲鏃ユ湡 DateTime yyyyMMdd = DateUtil.parse(birthByIdCard, "yyyyMMdd"); @@ -135,6 +140,16 @@ @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 @@ -338,4 +353,22 @@ 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) { + + } +// + + } } -- Gitblit v1.9.3