From 0411eeb918e0e09aa15cbefd0f9179932375757b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 13 五月 2024 17:18:57 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 548 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 373 insertions(+), 175 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 65ac052..cba4c22 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1,10 +1,12 @@
package com.doumee.service.business.impl;
-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.alibaba.fastjson.JSONObject;
+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.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.DataSyncConfig;
import com.doumee.config.Jwt.JwtPayLoad;
@@ -22,16 +24,12 @@
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.DESUtil;
-import com.doumee.core.utils.HttpsUtil;
-import com.doumee.core.utils.Utils;
+import com.doumee.core.utils.*;
import com.doumee.core.utils.redis.RedisUtil;
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.admin.response.StagingDataVO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
@@ -40,8 +38,6 @@
import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemUserMapper;
-import com.doumee.dao.system.model.SystemDepartment;
-import com.doumee.dao.system.model.SystemDepartmentUser;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.reqeust.AccountLoginDTO;
@@ -50,10 +46,6 @@
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.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -67,6 +59,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.*;
import java.util.stream.Collectors;
@@ -189,10 +182,13 @@
insert.setCode(member.getCode());
insert.setType(Constants.TWO);
insert.setHkDate(new Date());
+ insert.setWorkStatus(Constants.ONE);//榛樿鍦ㄨ亴
+ insert.setCanVisit(Constants.ZERO);//榛樿涓嶅彲璁块棶
+ insert.setAuthStatus(Constants.ZERO);
insert.setName(member.getName());
insert.setHkStatus(Constants.ONE);
- insert.setSex(IdcardUtil.getGenderByIdCard(member.getIdcardNo()) ==1?Constants.TWO:Constants.ONE);//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
- insert.setBirthday( DateUtil.parse(IdcardUtil.getBirthByIdCard(member.getIdcardNo()), "yyyyMMdd"));
+ insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
+ insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
insert.setPhone(member.getPhone());
insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//韬唤璇佸彿鍔犲瘑
insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
@@ -246,22 +242,88 @@
}
return false;
}
+ private boolean dealHkUserForUpdateBiz(Member update ) {
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+
+ UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(update,path,Constants.ONE);
+
+ //澶勭悊鏂板鏁版嵁
+ BaseResponse<UserAddResponse> result = HKService.editUser(hkAddRequest);
+ if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
+ update.setHkStatus(Constants.ONE);//宸插悓姝�
+ update.setRemark("浜哄憳淇℃伅宸插悓姝ユ垚鍔�");
+ if(StringUtils.isNotBlank(update.getFaceImg()) && Constants.equalsInteger(update.getFaceStatus(),Constants.ZERO)){
+ //濡傛灉鏈変汉鑴哥収鐗囷紝澶勭悊浜鸿劯鐓х墖鍚屾
+ String faceid = HkSyncOrgUserToHKServiceImpl.dealMemberFace(update,path);
+ if(StringUtils.isBlank(faceid)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍛樺伐浜鸿劯淇℃伅涓嶅悎鏍硷紝璇锋洿鎹汉鑴哥収鐗囬噸璇曪紒");
+ }else{
+ update.setFaceId(faceid);
+ update.setFaceStatus(Constants.ONE);
+ //濡傛灉浜鸿劯璺熶綘锛岄噸鏂颁笅鍙戞潈闄愭暟鎹�
+ update.setRemark("浜哄憳鍜屼汉鑴镐俊鎭悓姝ユ垚鍔�"+result.getMsg());
+ //閲嶆柊鎺堟潈璁惧鏉冮檺
+// HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,update,deviceRoleMapper,empowerMapper,deviceMapper);
+ }
+ }
+ update.setHkDate(update.getEditDate());
+ return true;
+ }else if(result!=null ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍚屾瀹夐槻骞冲彴澶辫触銆�"+result.getMsg()+"銆戯紝璇疯仈绯荤鐞嗗憳锛�");
+ }
+ return false;
+ }
+
+ /**
+ * 娓呴櫎鍛樺伐鐨勮澶囨潈闄�
+ * @param member
+ */
+ private void cancelAllMemberEmpower(Member member) {
+ //鍒犻櫎鍏ㄩ儴鏉冮檺
+ memberRoleMapper.update(null,new UpdateWrapper<MemberRole>().lambda()
+ .eq(MemberRole::getMemberId,member.getId())
+ .set(MemberRole::getIsdeleted,Constants.ONE)
+ .set(MemberRole::getEdirot,member.getEditor())
+ .set(MemberRole::getEditDate,member.getEditDate()));
+ //鎶婃墍鏈夊緟涓嬪彂鐨勪换鍔℃敼鎴� 宸插彇娑�
+ empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .eq(Empower::getSendStatus,Constants.EmpowerStatus.wait)
+ .set(Empower::getIsdeleted,Constants.ONE)
+ .set(Empower::getSendStatus,Constants.EmpowerStatus.cancel));
+ //鎵�鏈変笅鍙戣繃鐨勪换鍔★紝鏀逛负寰呭垹闄ゆ潈闄�
+ empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .set(Empower::getIsdeleted,Constants.ONE)
+ .notIn(Empower::getSendStatus,Constants.EmpowerStatus.fail)
+ .set(Empower::getRemark,"绛夊緟鍚屾鍒犻櫎瀹夐槻骞冲彴")
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .set(Empower::getSendStatus,Constants.ZERO));
+ }
private void isMemberParamValid(Member member) {
- if (!PhoneUtil.isPhone(member.getPhone())){
+ if (StringUtils.isBlank(member.getPhone())||!PhoneUtil.isPhone(member.getPhone())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
}
- if (!IdcardUtil.isValidCard(member.getIdcardNo())){
+ if (StringUtils.isBlank(member.getIdcardNo())||!IdcardUtil.isValidCard(member.getIdcardNo())){
+ if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
+ .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .ne(Member::getId,member.getId())) >0){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNo()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ }
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
}
- SystemUser systemUser = new SystemUser();
SystemUser queryUserDto = new SystemUser();
queryUserDto.setUsername(member.getPhone());
queryUserDto.setDeleted(Boolean.FALSE);
SystemUser user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
if (user != null) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+systemUser.getUsername()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+queryUserDto.getUsername()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
}
// 楠岃瘉宸ュ彿
if (StringUtils.isNotBlank(member.getCode())) {
@@ -273,6 +335,86 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿銆�"+member.getCode()+"銆戝凡瀛樺湪");
}
}
+ }
+ private Member isMemberUpdateParamValid(Member member) {
+ Member model = memberMapper.selectById(member.getId());
+ if(model ==null ||Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ュ憳宸ヤ俊鎭笉瀛樺湪锛岃鍒锋柊椤甸潰閲嶈瘯锛�");
+ }
+ if (StringUtils.isNotBlank(member.getPhone()) && !PhoneUtil.isPhone(member.getPhone())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
+ }
+ if (StringUtils.isNotBlank(member.getIdcardNoNew())){
+ String encrptNo = (DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNoNew()));//韬唤璇佸彿鍔犲瘑
+ if( !StringUtils.equals(model.getIdcardNo(),encrptNo)&& !IdcardUtil.isValidCard(member.getIdcardNoNew())){
+ //濡傛灉鍙戠敓鏀瑰彉锛屽苟涓斾笉鍚堟硶锛屾彁绀哄紓甯�
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"淇敼鐨勬柊韬唤璇佸彿鏍煎紡鏈夎");
+ }
+ if( !StringUtils.equals(model.getIdcardNo(),encrptNo) ){
+ if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
+ .eq(Member::getIdcardNo,encrptNo)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .ne(Member::getId,member.getId())) >0){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNoNew()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ }
+
+ member.setSex(Constants.getSexByCardNo( member.getIdcardNoNew()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
+ member.setIdcardDecode( Constants.getTuominStr(member.getIdcardNoNew()));
+ member.setIdcardNo(encrptNo);
+ }
+ }
+ boolean isNeedUpdateUser = false;
+ if(StringUtils.isNotBlank(member.getPhone()) && StringUtils.equals(member.getPhone(),model.getPhone())){
+ // 濡傛灉鎵嬫満鍙峰彂鐢熶慨鏀癸紝鏍￠獙鍞竴鎬�
+ SystemUser queryUserDto = new SystemUser();
+ queryUserDto.setUsername(member.getPhone());
+ queryUserDto.setDeleted(Boolean.FALSE);
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>(queryUserDto).lambda()
+ .ne(SystemUser::getMemberId,model.getId()).last("limit 1"));
+ if (user != null) {
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��" + queryUserDto.getUsername() + "銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ }
+ isNeedUpdateUser = true;
+ }
+ if(StringUtils.isNotBlank(member.getCode()) && StringUtils.equals(member.getPhone(),model.getCode())){
+ // 楠岃瘉宸ュ彿
+ SystemUser queryUserDto = new SystemUser();
+ queryUserDto = new SystemUser();
+ queryUserDto.setDeleted(Boolean.FALSE);
+ queryUserDto.setEmpNo(member.getCode());
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>(queryUserDto).lambda()
+ .ne(SystemUser::getMemberId,model.getId()).last("limit 1"));
+ if (user != null) {
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿銆�"+member.getCode()+"銆戝凡瀛樺湪");
+ }
+ isNeedUpdateUser = true;
+ }
+ if(member.getCompanyId()!=null && !Constants.equalsInteger(member.getCompanyId(),model.getCompanyId())){
+ //濡傛灉缁勭粐鍙戠敓鍙樺寲
+ Company company = companyMapper.selectById(member.getCompanyId());
+ if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭凡琚垹闄わ紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
+ }
+ if(StringUtils.isBlank(company.getHkId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭湭鍚屾瀹夐槻骞冲彴锛岃鍏堝墠寰�銆愮粍缁囩鐞嗐�戣彍鍗曡繘琛岀淮鎶わ紒");
+ }
+ member.setHkOrgId(company.getHkId());
+ isNeedUpdateUser = true;
+ }
+ if(isNeedUpdateUser){
+ //鏇存柊绯荤粺鐢ㄦ埛璐﹀彿淇℃伅
+ systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
+ .set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId())
+ .set(SystemUser::getUpdateTime,new Date())
+ .set(StringUtils.isNotBlank(model.getPhone()),SystemUser::getMobile,member.getPhone())
+ .set(StringUtils.isNotBlank(model.getName()),SystemUser::getRealname,member.getName())
+ .set(model.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId())
+ .set(StringUtils.isNotBlank(model.getCode()),SystemUser::getEmpNo,member.getCode())
+ .eq(SystemUser::getMemberId,model.getId()));
+ }
+ member.setHkId(model.getHkId());
+ member.setFaceId(model.getFaceId());//浜鸿劯缂栫爜
+ return model;
}
@Transactional
@@ -293,8 +435,6 @@
//鑴辨晱鎿嶄綔
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());
@@ -306,7 +446,7 @@
insert.setImgurl(member.getImgurl());
insert.setType(Constants.ZERO);
insert.setName(member.getName());
- insert.setBirthday(yyyyMMdd);
+ insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
insert.setPhone(member.getPhone());
insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
IdcardUtil.isValidCard(member.getIdcardNo());
@@ -331,7 +471,7 @@
}
@Override
- public void deleteById(Integer id) {
+ public void deleteById(Integer id,LoginUserInfo user) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Member member=new Member();
@@ -339,7 +479,10 @@
member.setIsdeleted(Constants.ZERO);
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
+ member.setHkStatus(Constants.ZERO);
+ member.setRemark("浜哄憳宸插垹闄わ紝绛夊緟鍒犻櫎闂ㄧ鏉冮檺");
memberMapper.updateById(member);
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper);
}
@@ -374,81 +517,151 @@
}
@Override
- public void deleteByIdInBatch(List<Integer> ids) {
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void deleteByIdInBatch(List<Integer> ids,LoginUserInfo loginUserInfo) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
- LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Member member=new Member();
ids.stream().forEach(s ->{
member.setId(s);
member.setIsdeleted(Constants.ONE);
+ member.setHkStatus(Constants.ZERO);
+ member.setRemark("浜哄憳宸插垹闄わ紝绛夊緟鍒犻櫎闂ㄧ鏉冮檺");
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
memberMapper.updateById(member);
-
- UserAction userAction=new UserAction();
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setCreator(loginUserInfo.getId());
- userAction.setType(9);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬垹闄ゃ��");
- userAction.setMemberId(s+"");
- userActionJoinMapper.insert(userAction);
-
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper);
});
-
-
-
-
- /* memberMapper.deleteBatchIds(ids);*/
}
+ /**
+ * 鎷夐粦鎴栬�呭喕缁撳憳宸ヤ俊鎭�
+ * @param ids
+ * @param type
+ * @param loginUserInfo
+ */
@Override
- public void batchBlock(List<Integer> ids,Integer type) {
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void batchBlock(List<Integer> ids,Integer type,LoginUserInfo loginUserInfo) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
- LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- Member member=new Member();
for (Integer id:ids) {
- member = memberMapper.selectById(id);
+ Member member = memberMapper.selectById(id);
if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
- UserAction userAction=new UserAction();
-// userAction.setBeforeStatus(member.getStatus());
member.setStatus(Constants.TWO);
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
+ member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
memberMapper.updateById(member);
+ Date date = new Date();
+ member.setEditDate(date);
+ member.setEditor(loginUserInfo.getId());
+ //鍒犻櫎鍛樺伐闂ㄧ鏉冮檺
+ cancelAllMemberEmpower(member);
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setCreator(loginUserInfo.getId());
if(Constants.equalsInteger(type,Constants.ONE)){
- userAction.setType(Constants.ONE);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬喕缁撱��");
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.FREEZE,userActionJoinMapper);
}
if(Constants.equalsInteger(type,Constants.TWO)){
- userAction.setType(Constants.TWO);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愭媺榛戙��");
-
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.BLACKLIST,userActionJoinMapper);
}
- userAction.setMemberId(id+"");
-
- userActionJoinMapper.insert(userAction);
}
}
- /* memberMapper.deleteBatchIds(ids);*/
+ }
+ /**
+ * 鎷夐粦鎴栬�呭喕缁撳憳宸ヤ俊鎭�
+ * @param ids
+ * @param type
+ * @param loginUserInfo
+ */
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void batchRemoveBlock(List<Integer> ids,Integer type,LoginUserInfo loginUserInfo) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return;
+ }
+ for (Integer id:ids) {
+ Member member = memberMapper.selectById(id);
+ if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
+ member.setStatus(Constants.ONE);//鎭㈠姝ｅ父鐘舵��
+ member.setEditor(loginUserInfo.getId());
+ member.setEditDate(new Date());
+ member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
+ memberMapper.updateById(member);
+ Date date = new Date();
+ member.setEditDate(date);
+ member.setEditor(loginUserInfo.getId());
+ if(Constants.equalsInteger(type,Constants.ONE)){
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.CANCEL_FREEZE,userActionJoinMapper);
+ }
+ if(Constants.equalsInteger(type,Constants.TWO)){
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.CANCEL_BLACKLIST,userActionJoinMapper);
+ }
+ }
+ }
}
@Override
- public void updateById(Member member) {
- memberMapper.updateById(member);
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void updateById(Member updateMember) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo == null){
+ loginUserInfo = updateMember.getLoginUserInfo();
+ }
+ //鏍￠獙鍙傛暟 骞朵笖鏇存柊systemuser 鎵嬫満鍙峰拰宸ュ彿淇℃伅锛堝鏋滈渶瑕佷慨鏀圭殑璇濓級
+ Member model = isMemberUpdateParamValid(updateMember);
+ updateMember.setEditor(loginUserInfo.getId());
+ updateMember.setEditDate(new Date());
+ //娴峰悍浜哄憳鏂板涓氬姟
+ if(dealHkUserForUpdateBiz(updateMember)){
+ updateMember.setHkId(null);
+ updateMember.setAuthStatus(Constants.ZERO);
+ memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+ .set(Member::getStartTime,null)
+ .set(Member::getEndTime,null)
+ .set(StringUtils.isNotBlank(updateMember.getPhone()),Member::getPhone,updateMember.getPhone())
+ .set(StringUtils.isNotBlank(updateMember.getName()),Member::getName,updateMember.getName())
+ .set(Member::getEditDate,updateMember.getEditDate())
+ .set(Member::getEditor,updateMember.getEditor())
+ .set(StringUtils.isNotBlank(updateMember.getIdcardNo()),Member::getIdcardNo,updateMember.getIdcardNo())
+ .set(StringUtils.isNotBlank(updateMember.getIdcardDecode()),Member::getIdcardDecode,updateMember.getIdcardDecode())
+ .set(updateMember.getAuthStatus()!=null,Member::getAuthStatus,updateMember.getAuthStatus())
+ .set(updateMember.getHkStatus()!=null,Member::getHkStatus,updateMember.getHkStatus())
+ .set(updateMember.getSex()!=null,Member::getSex,updateMember.getSex())
+ .set(updateMember.getFaceStatus()!=null,Member::getFaceStatus,updateMember.getFaceStatus())
+ .set(updateMember.getHkDate()!=null,Member::getHkDate,updateMember.getHkDate())
+ .set(StringUtils.isNotBlank(updateMember.getRemark()),Member::getRemark,updateMember.getRemark())
+ .set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg())
+ .set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
+ .set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
+ .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
+ .eq(Member::getId,updateMember.getId()));
+ cancelAllMemberEmpower(updateMember);
+ //璁板綍鎿嶄綔鏃ュ織
+ saveUserActionBiz(updateMember,loginUserInfo,Constants.UserActionType.EDIT,userActionJoinMapper);
+ }else{
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+ }
}
+
+ private void saveUserActionBiz(Member updateMember,LoginUserInfo user, Constants.UserActionType type,UserActionJoinMapper userActionMapper) {
+ UserAction userAction=new UserAction();
+ userAction.setIsdeleted(Constants.ZERO);
+ userAction.setCreateDate(updateMember.getEditDate());
+ userAction.setCreator(updateMember.getEditor());
+ userAction.setType(type.getKey());
+ String info = type.getInfo();
+ userAction.setRemark(info.replace("${param1}",user!=null?user.getRealname():"").replace("${param2}", com.doumee.core.utils.DateUtil.getPlusTime2(updateMember.getEditDate())));
+ userAction.setMemberId(updateMember.getId()+"");
+ userActionMapper.insert(userAction);
+ }
+
@Override
public boolean updateFace(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
@@ -489,95 +702,95 @@
}
HkSyncEmpowerServiceImpl.doHkDeleteUser(model.getId(),model.getHkId(),new Date(),memberMapper,memberCardMapper);
}
+ @Override
+ public void updateHead(Member member) {
+ Member model =memberMapper.selectById(member.getId());
+ if(model ==null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+ }
+ if(model.getCompanyId()!=null) {
+ if(Constants.equalsObject(member.getHeadStatus(),Constants.ONE)){
+ //濡傛灉鏄彇娑堜富绠�
+ companyMapper.update(null,new UpdateWrapper<Company>().lambda()
+ .eq(Company::getId,model.getCompanyId())
+ .set(Company::getHeadId,member.getId()));
+ }else{
+ //濡傛灉鏄涓轰富绠�
+ companyMapper.update(null,new UpdateWrapper<Company>().lambda()
+ .eq(Company::getId,model.getCompanyId())
+ .set(Company::getHeadId,null)
+ );
+ }
+ }
+ }
@Override
public void updateStatusById(Member member) {
+ Member model =memberMapper.selectById(member.getId());
+ if(model ==null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+ }
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo == null){
+ loginUserInfo = member.getLoginUserInfo();
+ }
Member update = new Member();
update.setEditDate(new Date());
update.setEditor(loginUserInfo.getId());
update.setStatus(member.getStatus());
memberMapper.updateById(update);
}
-
-
@Override
- public void updateVisitsStatusById(Member member) {
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void updateWorkStatus(Member member) {
+ Member model =memberMapper.selectById(member.getId());
+ if(model ==null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+ }
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- Member result=memberMapper.selectById(member.getId());
- Integer status=result.getStatus();
+ if(loginUserInfo == null){
+ loginUserInfo = member.getLoginUserInfo();
+ }
Member update = new Member();
+ update.setId(member.getId());
update.setEditDate(new Date());
update.setEditor(loginUserInfo.getId());
- update.setStatus(Constants.Status.FREEZE.getValue());
- update.setId(member.getId());
+ update.setWorkStatus(Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)?Constants.ONE:Constants.ZERO);
+ if(Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)){
+ //濡傛灉鏄鑱�
+ cancelAllMemberEmpower(update);
+ }
+ update.setAuthStatus(Constants.ZERO);
memberMapper.updateById(update);
-
- UserAction userAction=new UserAction();
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setCreator(loginUserInfo.getId());
- if(Constants.equalsInteger(result.getType(),Constants.TWO)){
- userAction.setType(Constants.ONE);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬喕缁撱��");
- }
- if(Constants.equalsInteger(result.getType(),Constants.ZERO)){
- userAction.setType(Constants.TWO);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愭媺榛戙��");
-
- }
- userAction.setMemberId(result.getId()+"");
- userAction.setBeforeStatus(status);
- userActionJoinMapper.insert(userAction);
- }
-
-
- @Override
- public void updateRemoveStatusById(List<Member> members) {
- LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
- Date date=new Date();
- members.stream().forEach(s ->{
- Member result=memberMapper.selectById(s.getId());
- Integer status=result.getStatus();
- Member update = new Member();
- update.setEditDate(date);
- update.setEditor(loginUserInfo.getId());
- update.setStatus(Constants.Status.ENABLE.getValue());
- update.setId(s.getId());
- memberMapper.updateById(update);
-
- //瑙ｅ喕涓氬姟 澶勭悊鐢ㄦ埛鎺堟潈瀵煎叆璁板綍
- this.thawMember(result);
-
- UserAction userAction=new UserAction();
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setCreator(loginUserInfo.getId());
- if(Constants.equalsInteger(result.getType(),Constants.TWO)){
- userAction.setType(Constants.ZERO);
- userAction.setBeforeStatus(Constants.ONE);
- }
- if(Constants.equalsInteger(result.getType(),Constants.ONE)){
- userAction.setBeforeStatus(status);
- userAction.setType(Constants.TWO);
- }
- userAction.setMemberId(result.getId()+"");
- userActionJoinMapper.insert(userAction);
- });
+ //璁板綍鎿嶄綔鏃ュ織
+ saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)?Constants.UserActionType.WORK_OFF:Constants.UserActionType.WORK_ON,userActionJoinMapper);
}
-
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void updateCanVisitById(Member member) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo == null){
+ loginUserInfo = member.getLoginUserInfo();
+ }
+ Member model =memberMapper.selectById(member.getId());
+ if(model ==null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+ }
+ if(Constants.equalsInteger(member.getCanVisit(),model.getCanVisit())){
+ //濡傛灉娌℃湁鍙戠敓鍙樺寲锛岀洿鎺ヨ繑鍥�
+ return;
+ }
Member update = new Member();
update.setEditDate(new Date());
+ update.setId(member.getId());
update.setEditor(loginUserInfo.getId());
update.setCanVisit(member.getCanVisit());
memberMapper.updateById(update);
+ //璁板綍鎿嶄綔鏃ュ織
+ saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getCanVisit(),Constants.ONE)?Constants.UserActionType.CANVISIT:Constants.UserActionType.CANCEL_VISIT,userActionJoinMapper);
}
@Override
@@ -606,8 +819,7 @@
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(Member.class)
- .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
- .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName);
+ .selectAs(Company::getName,Member::getCompanyName) ;
if(null != member.getType()) {
queryWrapper.eq(Member::getType,member.getType());
@@ -785,36 +997,6 @@
}
@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 =pageWrap.getModel().getTrainTimeEndTime() !=null? Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime()):new Date();
- 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(" (select Max(tt.END_TIME) from train_time tt where tt.ISDELETED=0 and tt.MEMBER_ID=t.id) as trainTimeEndTime")*/
- .select(" (select Max(e.END_TIME) from empower e where e.ISDELETED=0 and e.MEMBER_ID=t.id) as empowerEndTime");
-
- queryWrapper.eq(Member::getType,Constants.ZERO);
- 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(pageWrap.getModel().getTrainTimeEndTime()!=null,"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()) ==1?Constants.TWO:Constants.ONE));
- }
- return PageData.from(memberIPage);
- }
-
- @Override
public long count(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<Member>(member);
wrapper.lambda().like(StringUtils.isNotBlank(member.getRoleIdParam()), Member::getRoleId, member.getRoleIdParam());
@@ -839,16 +1021,22 @@
}
@Override
- public PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
+ public PageData<Member> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Member.class);
queryWrapper.selectAs(Company::getName,Member::getCompanyName);
+ queryWrapper.selectAs(SystemUser::getRealname,Member::getEditorName);
+ queryWrapper.selectAs(Company::getType,Member::getCompanyType);
+ queryWrapper.selectAs(Company::getHeadId,Member::getHeadId);
queryWrapper.selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath);
queryWrapper.selectAs(Company::getCompanyPath,Member::getCompanyPath);
queryWrapper.select(" ( select count(1) from member_card mc where mc.isdeleted = 0 and mc.member_id = t.id ) as memberCardCount ");
+ queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Member::getEditor);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.eq(Member::getType,pageWrap.getModel().getType());
+// queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
Member::getCompanyId,pageWrap.getModel().getCompanyIds())
.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyword()),ms->ms
@@ -864,16 +1052,26 @@
.eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
// .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
- .eq(Member::getType,Constants.memberType.internal)
+// .eq(Member::getType,Constants.memberType.internal)
.eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
.orderByDesc(!Constants.equalsObject(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
.orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
}else{
- queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
+// queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
}
- IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ if(pageWrap.getModel().getCompanyId()!=null){
+ if(pageWrap.getModel().getIncludeChild()!=null &&pageWrap.getModel().getIncludeChild() ){
+ //濡傛灉鍖呭惈涓嬬骇缁勭粐
+ Company company = companyMapper.selectById(pageWrap.getModel().getCompanyId());//鏌ヨ缁勭粐淇℃伅
+ queryWrapper.likeRight(Company::getCompanyPath,company.getCompanyPath());
+ }else{
+ //涓嶅寘鍚笅绾х粍缁�
+ queryWrapper.eq(Company::getId,pageWrap.getModel().getCompanyId());
+ }
+ }
+ IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
if(CollectionUtils.isNotEmpty(memberIPage.getRecords())){
//FTP鏂囦欢璁块棶鍓嶇紑
@@ -883,8 +1081,11 @@
List<DeviceRole> deviceRoleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
.select(DeviceRole::getId,DeviceRole::getName)
.eq(DeviceRole::getIsdeleted,Constants.ZERO));
- for (MemberInfoDTO memberInfoDTO:memberIPage.getRecords()) {
+ for (Member memberInfoDTO:memberIPage.getRecords()) {
//鑾峰緱闂ㄧ缁勫悕绉版暟缁�
+ memberInfoDTO.setCanVisit(Constants.formatIntegerNum(memberInfoDTO.getCanVisit()));
+ memberInfoDTO.setWorkStatus(Constants.formatIntegerNum(memberInfoDTO.getWorkStatus()));
+ memberInfoDTO.setHeadStatus(Constants.equalsInteger(memberInfoDTO.getHeadId(),memberInfoDTO.getId())?Constants.ONE:Constants.ZERO);
memberInfoDTO.setRoleNames(this.dealRoleDatas(memberInfoDTO.getRoleId(),deviceRoleList));
//鎷兼帴鍓嶇紑
if(StringUtils.isNotBlank(memberInfoDTO.getFaceImg())){
@@ -925,13 +1126,13 @@
}
@Override
- public PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap) {
+ public PageData<Member> findVisitPage(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)
- .selectAs(Member::getLastVisitDate,MemberInfoDTO::getVisitsLastDate)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .selectAs(Member::getLastVisitDate,Member::getLastVisitDate)
.select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status in (7,8) ) as visitsCount");
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
.like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
@@ -948,21 +1149,21 @@
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
}else{
- queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
+ queryWrapper.eq((pageWrap.getModel().getCompanyId())!=null,Member::getCompanyId,pageWrap.getModel().getCompanyId());
}
- IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
return PageData.from(memberIPage);
}
@Override
- public PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
+ public PageData<Member> 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)
+ .selectAs(Company::getName,Member::getCompanyName)
.select(" (select ua.CREATE_DATE from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0 order by ua.CREATE_DATE desc limit 1) as optTime")
.select(" (select s.REALNAME from user_action uac left join system_user s on uac.CREATOR = s.ID where uac.MEMBER_ID=t.id and uac.ISDELETED=0 order by uac.CREATE_DATE desc limit 1) as creatorName")
.select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 order by CREATE_DATE desc limit 1) as visitsLastDate")
@@ -977,12 +1178,12 @@
.or().like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName()))
.like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
.eq(Member::getStatus,Constants.Status.FREEZE.getValue())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId())
+ .eq((pageWrap.getModel().getCompanyId())!=null,Company::getId,pageWrap.getModel().getCompanyId())
.eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
.orderByDesc(Member::getCreateDate);
- IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
return PageData.from(memberIPage);
}
@@ -1073,15 +1274,12 @@
return;
}
List<Integer> memberIds = memberList.stream().map(m->m.getId()).collect(Collectors.toList());
-
+ Date date = new Date();
for (Integer id:memberIds) {
- UserAction userAction=new UserAction();
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setType(1);
- userAction.setRemark("鐢卞畾鏃朵换鍔′簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬喕缁撱��");
- userAction.setMemberId(id+"");
- userActionJoinMapper.insert(userAction);
+ Member updateMember = new Member();
+ updateMember.setId(id);
+ updateMember.setEditDate(date);
+ saveUserActionBiz(updateMember,null,Constants.UserActionType.FREEZE,userActionJoinMapper);
}
--
Gitblit v1.9.3