From 300d75d257dbe60401dfb97123ae39e32f37380e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 18:28:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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 7f39337..f9a1579 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
@@ -198,7 +198,22 @@
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);
+
});
+
+
+
+
+
/* memberMapper.deleteBatchIds(ids);*/
}
@@ -213,7 +228,7 @@
member = memberMapper.selectById(id);
if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
UserAction userAction=new UserAction();
- userAction.setBeforeStatus(member.getStatus());
+// userAction.setBeforeStatus(member.getStatus());
member.setStatus(Constants.TWO);
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
@@ -313,12 +328,13 @@
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.ZERO)){
- userAction.setType(Constants.THREE);
+ if(Constants.equalsInteger(result.getType(),Constants.ONE)){
+ userAction.setBeforeStatus(status);
+ userAction.setType(Constants.TWO);
}
userAction.setMemberId(result.getId()+"");
- userAction.setBeforeStatus(status);
userActionJoinMapper.insert(userAction);
});
}
@@ -806,6 +822,17 @@
}
List<Integer> memberIds = memberList.stream().map(m->m.getId()).collect(Collectors.toList());
+ 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);
+ }
+
+
//鍐荤粨鐘舵��
memberMapper.update(null,new UpdateWrapper<Member>()
.lambda().set(Member::getStatus,Constants.TWO)
--
Gitblit v1.9.3