k94314517
2024-02-26 5c7741b3a6c84379b0ac43cfc464e85085c8bc33
ERP接口
已修改2个文件
18 ■■■■■ 文件已修改
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -100,6 +100,8 @@
    // 内部人员冻结配置时间
    public static final String TIMEOUT_FREEZE = "TIMEOUT_FREEZE";
    // 超时预警配置
    public static final String TIMEOUT_WARNING = "TIMEOUT_WARNING";
    // FTP文件服务器资源访问地址
    public static  Date  getBirthdyByCardNo(String idCard){
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1012,12 +1012,12 @@
    @Override
    public PageData<Visits> retentionPage(PageWrap<Visits> pageWrap) {
        String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode();
        IPage<Visits> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Visits.class);
        queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
        queryWrapper.select("TIMESTAMPDIFF(MINUTE,t.ENDTIME , NOW()) AS timeOut");
        queryWrapper.select("TIMESTAMPDIFF( MINUTE, NOW(), t.ENDTIME) AS timeOut");
        queryWrapper.selectAs(Member::getType,Visits::getMemberType);
        queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
        queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
@@ -1025,6 +1025,9 @@
        queryWrapper.leftJoin(" member m on m.id=t.MEMBER_ID");
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getLevelStatus()),Visits::getStatus,Constants.VisitStatus.signin);
        queryWrapper.apply(Objects.nonNull(pageWrap.getModel().getLevelStatus())," TIMESTAMPDIFF( MINUTE, NOW(), t.ENDTIME) <= "+code+"  ");
        queryWrapper.ne("m.type ",Constants.TWO);
        queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Visits::getType,pageWrap.getModel().getType());
@@ -1035,16 +1038,15 @@
                .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Visits::getStatus,pageWrap.getModel().getStatus());
        queryWrapper.isNull(Visits::getOutDate);
        queryWrapper.orderByDesc(Visits::getEditDate);
       String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_FREEZE).getCode();
        IPage<Visits> result = visitsJoinMapper.selectJoinPage(page, Visits.class,queryWrapper);
        if(result!=null&&result.getRecords()!=null){
            result.getRecords().stream().forEach(s ->{
                if(s.getTimeOut()>=Constants.ZERO){
                    s.setOutStatus(Constants.ONE);
                }else if(s.getTimeOut()<=Integer.valueOf(code)&&s.getTimeOut()>0){
                if(s.getTimeOut()<=Integer.valueOf(code)&&s.getTimeOut()>=0){
                    s.setOutStatus(Constants.TWO);
                }else{
                }else if(s.getTimeOut()>Constants.ZERO){
                    s.setOutStatus(Constants.ZERO);
                }else{
                    s.setOutStatus(Constants.ONE);
                }
            });