最新版本541200007

jiangping

2025-05-19 621882746b29b71669ccdc9529eb7c7988f93a0e

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java

@@ -146,7 +146,7 @@
            if(delRetentionLis.size()>0){
                //先删除原有的在场人员(内部人员）
                retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
                        .eq(Retention::getType,Constants.memberType.internal)
//                        .eq(Retention::getType,Constants.memberType.internal)
                        .in(Retention::getMemberId,delRetentionLis));
            }
            if(retentionList.size()>0){
@@ -1086,6 +1086,7 @@
                delRetentionList.add(event.getPlateNos());
                Retention dm = new Retention();
                dm.setMemberId(event.getMemberId());
                dm.setPhone(carrecord.getMemberPhone());
                dm.setCarNo(event.getPlateNos());
                delMemberRetentionList.add(dm);
                retentionList.add(getRetentionModelByParkRequest(request,event,carrecord));//在厂车辆信息
@@ -1096,6 +1097,7 @@
                delRetentionList.add(event.getPlateNos());
                Retention dm = new Retention();
                dm.setMemberId(event.getMemberId());
                dm.setPhone(carrecord.getMemberPhone());
                dm.setCarNo(event.getPlateNos());
                delMemberRetentionList.add(dm);
                inoutDayCount.setOutCarNum(Constants.formatIntegerNum(inoutDayCount.getOutCarNum())+1);
@@ -1125,7 +1127,12 @@
                        carrecord.setCategoryParentName(StringUtils.defaultString(category.getParentName(),"访客车辆"));
                        carrecord.setCategoryParentId(category.getParentId());
                        for(Visits v :visitsList){
                            delMemberRetentionList.add(event.getMemberId());
                            Retention dm = new Retention();
                            dm.setMemberId(event.getMemberId());
                            dm.setPhone(carrecord.getMemberPhone());
                            dm.setCarNo(event.getPlateNos());
                            delMemberRetentionList.add(dm);
//                            delMemberRetentionList.add(event.getMemberId());
                            InoutRecord copyObj = new InoutRecord();
                            BeanUtils.copyProperties(carrecord,copyObj);
                            copyObj.setMemberId(v.getMemberId());
@@ -1396,6 +1403,7 @@
        retention.setDeviceName(request.getSrcName());
        retention.setDeviceIndex(request.getSrcIndex());
        retention.setCarNo(inoutRecord.getCarCode());
        retention.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());
        retention.setRemark("跟随车辆【"+inoutRecord.getCarCode()+"】入园区");
        return retention;
    }
@@ -1412,6 +1420,7 @@
        retention.setCategoryName(carrecord.getCategoryName());
        retention.setCategoryParentId(carrecord.getCategoryParentId());
        retention.setCategoryParentName(carrecord.getCategoryParentName());
        retention.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());
//        retention.setDeviceName(request.getSrcName());
//        retention.setDeviceIndex(request.getSrcIndex());