Merge remote-tracking branch 'origin/master'

lishuai

2023-12-26 70577a6d6cf2bded29e71dcad11a0c2605193d20

 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 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");

@@ -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 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);


@@ -736,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;
@@ -747,6 +750,7 @@
        //冻结状态
        memberMapper.update(null,new UpdateWrapper<Member>()
                .lambda().set(Member::getStatus,Constants.TWO)
                .set(Member::getEditDate,new Date())
                .in(Member::getId,memberIds)
        );
        //处理下发数据
@@ -808,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;
    }