From 3f7aa1396eef8f046a9debb880285ce6b32acc53 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期五, 22 十二月 2023 15:33:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 8 +++++---
1 files changed, 5 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 1509c10..f448df3 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
@@ -242,9 +242,12 @@
userAction.setCreator(loginUserInfo.getId());
if(Constants.equalsInteger(result.getType(),Constants.TWO)){
userAction.setType(Constants.ONE);
+ userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+new Date()+"銆戯紝杩涜銆愬喕缁撱��");
}
if(Constants.equalsInteger(result.getType(),Constants.ZERO)){
userAction.setType(Constants.TWO);
+ userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+new Date()+"銆戯紝杩涜銆愭媺榛戙��");
+
}
userAction.setMemberId(result.getId()+"");
userAction.setBeforeStatus(status);
@@ -637,7 +640,7 @@
queryWrapper.selectAll(Member.class)
.selectAs(Company::getName,MemberInfoDTO::getCompanyName)
.select(" (select ua.CREATE_DATE from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0 and ua.type=1 order by ua.CREATE_DATE limit 1) as userActionType1")
- .select(" (select su.USERNAME from user_action uac left join system_user su on su.id=uac.CREATOR where uac.MEMBER_ID=t.id and uac.ISDELETED=0 and uac.type=1 order by uac.CREATE_DATE limit 1) as creatorName")
+ .select(" (select su.remark from user_action uac where uac.MEMBER_ID=t.id and uac.ISDELETED=0 and uac.type=1 order by uac.CREATE_DATE limit 1) as creatorName")
/* .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0) as visitsCount")*/
.select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 order by CREATE_DATE limit 1) as visitsLastDate");
@@ -650,7 +653,6 @@
.like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
.eq(Member::getStatus,Constants.Status.FREEZE.getValue())
.eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
- .exists(Objects.nonNull(pageWrap.getModel().getCreaterId()),"select 1 from user_action uac where uac.MEMBER_ID=t.id and uac.ISDELETED=0 and uac.type=1 and uac.CREATOR= "+pageWrap.getModel().getCreaterId()+" order by uac.CREATE_DATE limit 1")
.orderByDesc(Member::getCreateDate);
@@ -737,7 +739,7 @@
.lambda().eq(Member::getIsdeleted,Constants.ZERO)
.eq(Member::getType,Constants.memberType.internal)
.isNotNull(Member::getHkId)
- .notExists(" SELECT 1 FROM device_event b WHERE b.ext_event_person_no = a.HK_ID AND TO_DAYS( NOW())- TO_DAYS( b.CREATE_DATE )> "+systemDictData.getCode()+") ")
+ .notExists(" SELECT 1 FROM device_event b WHERE b.ext_event_person_no = HK_ID AND TO_DAYS( NOW()) - TO_DAYS( b.CREATE_DATE ) > "+systemDictData.getCode()+" ")
);
if(CollectionUtils.isEmpty(memberList)){
return;
--
Gitblit v1.9.3