整理

jiangping

2024-02-27 de000e39e5acf882a1e3ea78f078373d6605bb36

整理

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java

@@ -59,7 +59,6 @@
    @ApiModelProperty(value = "人脸照片")
    @ExcelColumn(name="人脸照片")
    private String faceImg;

    @ApiModelProperty(value = "健康码")
    @ExcelColumn(name="健康码")
    private String imgurl;
@@ -138,5 +137,9 @@
    @ApiModelProperty(value = "结束时间")
    @TableField(exist = false)
    private Date endTime;
    @ApiModelProperty(value = "人脸照片")
    @TableField(exist = false)
    private String faceImgFull;


}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java

@@ -105,7 +105,6 @@
    private Integer idType;

    @ApiModelProperty(value = "证件号 ")
    @ExcelColumn(name="证件号")
    private String idNo;

    @ApiModelProperty(value = "被访问人姓名")
@@ -167,8 +166,8 @@
//    @ExcelColumn(name="被访问人所属组织id")
    private String beVisitedPersonOrgId;

    @ApiModelProperty(value = "被访问人所属组织id")
//    @ExcelColumn(name="被访问人所属组织id")
    @ApiModelProperty(value = "证件号")
    @ExcelColumn(name="证件号")
    private String idcardDecode;

    // 条件查询参数

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java

@@ -200,9 +200,11 @@
            List<SystemDictData> list = systemDictDataMapper.list(codes);
            Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
            retentionIPage.getRecords().stream().forEach(obj->{
                obj.setFaceImg(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
                        +dataMap.get(Constants.MEMBER_IMG).getCode()
                        +obj.getFaceImg());
                if(StringUtils.isNotBlank(obj.getFaceImg())){
                    obj.setFaceImgFull(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
                            +dataMap.get(Constants.MEMBER_IMG).getCode()
                            +obj.getFaceImg());
                }
            });
        }
        return PageData.from(retentionIPage);

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java

@@ -1009,7 +1009,7 @@
        }
        Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
        if(Objects.isNull(member)){
            return;
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，用户信息不存在！");
        }
        //删除车量库记录数据
        parkBookMapper.update(null,new UpdateWrapper<ParkBook>().lambda()
@@ -1037,6 +1037,8 @@
                parkBookList.add(parkBook);
            }
            parkBookMapper.insertBatchSomeColumn(parkBookList);
        }else{
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，停车库信息不存在，授权失败");
        }

    }

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

@@ -326,6 +326,11 @@
                updateVistis.setStatus(Constants.VisitStatus.signin);
                updateVistis.setInDate(DateUtil.getISO8601DateByStr(model.getStartTime()));
                updateVistis.setOutDate(DateUtil.getISO8601DateByStr(model.getEndTime()));
                //更新最新来访时间
                Member member = new Member();
                member.setLastVisitDate(updateVistis.getInDate());
                member.setId(visits.getMemberId());
                memberMapper.updateById(member);
            }else {
                //如果是访客签离事件
                updateVistis.setStatus(Constants.VisitStatus.signout);