From e7b486f54ecee830749151e0fd8feae726fd4107 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 13:45:21 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 8 ++++----
1 files changed, 4 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 28a14b7..f99f148 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
@@ -542,8 +542,8 @@
@Override
public PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
- /* //鏄惁鏄暟瀛�
- boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
+ //鏄惁鏄暟瀛�
+ /* boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈涓枃
boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈鑻辨枃
@@ -634,11 +634,10 @@
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
- queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Member::getCreator);
- queryWrapper.selectAs(SystemUser::getUsername,MemberInfoDTO::getCreatorName);
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 concat(su.USERNAME,'&&',uac.create_date) 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 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");
@@ -651,6 +650,7 @@
.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 uac.USERNAME from user_action uac where uac.MEMBER_ID=t.id and uac.ISDELETED=0 and uac.type=1 and uac.CREATOR=#{} order by uac.CREATE_DATE limit 1",pageWrap.getModel().getCreaterId())
.orderByDesc(Member::getCreateDate);
--
Gitblit v1.9.3