From 63fa498d66c928e0802010dae9f8f9dab4876b2f Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 14:25:18 +0800
Subject: [PATCH] 导出字段显示
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 12 +++++++++---
1 files changed, 9 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 e4012f9..8d0b612 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
@@ -640,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.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 uac.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");
@@ -738,8 +738,9 @@
List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>()
.lambda().eq(Member::getIsdeleted,Constants.ZERO)
.eq(Member::getType,Constants.memberType.internal)
+ .eq(Member::getStatus,Constants.ZERO)
.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()+") ")
+ .exists(" 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;
@@ -749,6 +750,7 @@
//鍐荤粨鐘舵��
memberMapper.update(null,new UpdateWrapper<Member>()
.lambda().set(Member::getStatus,Constants.TWO)
+ .set(Member::getEditDate,new Date())
.in(Member::getId,memberIds)
);
//澶勭悊涓嬪彂鏁版嵁
@@ -810,7 +812,11 @@
.last(" limit 1 ")
);
MemberVO memberVO = new MemberVO();
- BeanUtils.copyProperties(member,memberVO);
+ if(!Objects.isNull(member)){
+ BeanUtils.copyProperties(member,memberVO);
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
return memberVO;
}
--
Gitblit v1.9.3