From 095d19dff25e37c8abf3cf197a4bdac6a2b3ecd5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 02 七月 2025 09:37:45 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 68 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 17 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 e9173a9..a83804f 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
@@ -126,6 +126,10 @@
private TmsService tmsService;
@Autowired
private SystemUserMapper systemUserMapper;
+ @Autowired
+ private CarsMapper carsMapper;
+ @Autowired
+ private ParkBookMapper parkBookMapper;
@Autowired
@Lazy
@@ -561,7 +565,7 @@
insert.setParentId(member.getParentId());
memberMapper.insert(insert);
- /* TrainTime trainTime = new TrainTime();
+ /* TrainTime trainTime = new TrainTime();
trainTime.setCreator(loginUserInfo.getId().toString());
trainTime.setCreateDate(new Date());
trainTime.setEdirot(loginUserInfo.getId().toString());
@@ -575,15 +579,16 @@
trainTimeMapper.insert(trainTime);*/
return insert.getId();
}
-
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void deleteById(Integer id,LoginUserInfo loginUserInfo) {
+
+ Date date =new Date();
Member member=new Member();
member.setId(id);
member.setIsdeleted(Constants.ONE);
member.setEditor(loginUserInfo.getId());
- member.setEditDate(new Date());
+ member.setEditDate(date);
member.setHkStatus(Constants.ZERO);
member.setRemark("浜哄憳宸插垹闄わ紝绛夊緟鍒犻櫎闂ㄧ鏉冮檺");
memberMapper.updateById(member);
@@ -597,11 +602,32 @@
.set(SystemUser::getUpdateUser,member.getEditor())
.set(SystemUser::getUpdateTime,member.getEditDate())
);
-
+// cancelAllMemberEmpower(member,memberRoleMapper,empowerMapper);
saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
+ List<Cars> carsList = carsMapper.selectList(new QueryWrapper<Cars>().lambda()
+ .eq(Cars::getMemberId,member.getId())
+ .eq(Cars::getIsdeleted,Constants.ZERO)
+ .eq(Cars::getAuthStatus,Constants.ONE)//宸叉巿鏉冨寘鏈熺殑杞﹁締
+ );
+ if (carsList!=null && carsList.size()>0){
+ for(Cars car :carsList){
+ if(Constants.equalsInteger(car.getAuthStatus(),Constants.ONE)){
+ carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
+ .eq(Cars::getId,car.getId())
+ .set(Cars::getStartTime,null)
+// .set(Cars::getMemberId,null)
+ .set(Cars::getEndTime,null)
+ .set(Cars::getAuthTimeType,null)
+ .set(Cars::getAuthStatus,Constants.ZERO)
+ .set(Cars::getEditDate,member.getEditDate())
+ .set(Cars::getEdirot,member.getEditor())
+ );
+ //鍒犻櫎宸叉巿鏉冧笅鍙戠殑鍖呮湡鎺堟潈
+ CarsServiceImpl.dealCancelBookBiz(car.getCode(),date,parkBookMapper);
+ }
+ }
+ }
}
-
-
@Override
public void roleAuthById(Integer id,LoginUserInfo user) {
Member member = memberMapper.selectById(id);
@@ -670,7 +696,6 @@
memberRole.setStartTime(trainTime.getStartTime());
memberRole.setEndTime(trainTime.getEndTime());
}
-
memberMapper.update(null,new UpdateWrapper<Member>().lambda()
.eq(Member::getId,member.getId())
.set(Member::getRoleId,member.getRoleId())
@@ -968,7 +993,7 @@
public static void saveUserActionBiz(Member updateMember,LoginUserInfo user, Constants.UserActionType type,UserActionJoinMapper userActionMapper,String content) {
updateMember.setEditDate(updateMember.getEditDate()==null?new Date():updateMember.getEditDate());
- UserAction userAction=new UserAction();
+ UserAction userAction=new UserAction();
userAction.setIsdeleted(Constants.ZERO);
userAction.setCreateDate(updateMember.getEditDate());
userAction.setCreator(updateMember.getEditor());
@@ -1467,11 +1492,15 @@
.like(Member::getPhone,pageWrap.getModel().getKeyword())
.or().like(Member::getName,pageWrap.getModel().getKeyword())
.or().like(Member::getCode,pageWrap.getModel().getKeyword()))
+ .eq(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,
+ DESUtil.encrypt(Constants.EDS_PWD, pageWrap.getModel().getIdcardNo())
+ )
.isNull(pageWrap.getModel().getHasFace()!=null&& Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ZERO),Member::getFaceId)
.isNotNull(pageWrap.getModel().getHasFace()!=null&& Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ONE),Member::getFaceId)
.eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),Member::getCanVisit,pageWrap.getModel().getCanVisit())
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
.eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
+ .eq(Objects.nonNull(pageWrap.getModel().getAuthStatus()),Member::getAuthStatus,pageWrap.getModel().getAuthStatus())
.eq(Objects.nonNull(pageWrap.getModel().getWorkStatus()),Member::getWorkStatus,pageWrap.getModel().getWorkStatus())
.eq(Objects.isNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,Constants.ZERO)
.eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
@@ -1481,8 +1510,11 @@
// .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
// .eq(Member::getType,Constants.memberType.internal)
.eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
- .orderByAsc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getPinyin)
- .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
+
+ .orderByAsc(Company::getSortnum)
+ .orderByAsc(Position::getSortnum);
+// .orderByAsc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getPinyin)
+// .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{
@@ -1587,7 +1619,10 @@
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
.eq(Member::getType,Constants.memberType.visitor)
.eq(Member::getIsdeleted,Constants.ZERO)
- .orderByAsc(Member::getPinyin);
+ .orderByAsc(Company::getSortnum)
+ .orderByAsc(Position::getSortnum);
+
+
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
}else{
@@ -1800,7 +1835,7 @@
SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getOpenid,openId)
.in(SystemUser::getType,Constants.memberType.internal)
- .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .eq(SystemUser::getDeleted,Constants.ZERO)
.last(" limit 1 "));
//闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
if(!Objects.isNull(user)){
@@ -1829,7 +1864,7 @@
SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getOpenid,openId)
.in(SystemUser::getType,Constants.memberType.internal,Constants.memberType.driver)
- .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .eq(SystemUser::getDeleted,Constants.ZERO)
.last(" limit 1 "));
//闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
if(!Objects.isNull(user)){
@@ -1861,7 +1896,7 @@
.eq(SystemUser::getOpenid,openId)
.eq(SystemUser::getType,source)
// .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
- .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .eq(SystemUser::getDeleted,Constants.ZERO)
.last(" limit 1 "));
//闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
if(!Objects.isNull(user)){
@@ -1923,7 +1958,6 @@
}
}
-
@Override
public List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO){
List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
@@ -1933,7 +1967,7 @@
.selectAs(Position::getName,Member::getPositionName)
.leftJoin(Position.class,Position::getId,Member::getPositionId)
.eq(StringUtils.isNotBlank(checkVisitedDTO.getMobile()),Member::getPhone,checkVisitedDTO.getMobile())
- .eq(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
+ .like(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
.eq(Member::getIsdeleted,Constants.ZERO)
.eq(Member::getStatus,Constants.ZERO)
.eq(Member::getWorkStatus,Constants.ZERO)
@@ -2169,7 +2203,7 @@
String candNo = DESUtil.encrypt(Constants.EDS_PWD, model.getIdcardNo());
if(StringUtils.isNotBlank(model.getIdcardNo())){
if(findMemberFromListByIdcard(candNo,memberList ) !=null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戝凡瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戝凡瀛樺湪锛岃纭銆愯瀹㈢鐞嗐�戙�愬唴閮ㄤ汉鍛樸�戜互鍙娿�愮浉鍏虫柟浜哄憳銆戜腑鏃犺韬唤璇佸瓨鍦紝璇锋鏌ヨ〃鏍煎唴瀹癸紒");
}
}
--
Gitblit v1.9.3