Merge remote-tracking branch 'origin/master'

jiangping

2025-05-09 4248fbfb4f6a43cbb4884523f599d7719d1ba1c6

Merge remote-tracking branch 'origin/master'

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -1329,12 +1329,14 @@
                        .orderByAsc(Bookings::getStartTime)
                        .last(" limit 1 ")
                );
                if(Objects.nonNull(bookings)){
                bookings.setStartTimeReal(new Date());
                bookings.setEditDate(new Date());
                    bookings.setEditDate(bookings.getStartTimeReal());
                bookingsMapper.updateById(bookings);
            }
        }
    }
    }

    /**
     * 提前开始

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

@@ -78,7 +78,7 @@
            "3=安泰的预约入园车辆：货运车辆-加工烟卸货车辆 ;" +
            "4=安泰公务车：公务车-安泰物流公务用车;" +
            "5=安泰自有车：货运车辆-安泰物流货运车辆 ")
    @ExcelColumn(name="业务类型",index = 4,width = 16,valueMapping = "0=访客车辆-访客车辆;1=货运车辆-外协运输车辆;2=货运车辆-市公司卸货车辆;3=货运车辆-加工烟卸货车辆;4=公务车-安泰物流公务用车;5=货运车辆-安泰物流货运车辆;6=未知车辆;")
    @ExcelColumn(name="业务类型",index = 4,width = 16,valueMapping = "0=访客车辆;1=外协运输车辆;2=市公司卸货车辆;3=加工烟卸货车辆;4=安泰物流公务用车;5=安泰物流货运车辆;6=未知车辆;")
    private Integer bizType;

    @ApiModelProperty(value = "父级编码（自关联）")

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

@@ -58,7 +58,7 @@
    private Integer type;
    @ApiModelProperty(value = " 类型 0相关方组织 1内部人员 2访客")
    @TableField(exist = false)
    @ExcelColumn(name="人员类型" ,index = 5, valueMapping="0=劳务访客;1=普通访客;2=内部员工;3=车辆信息;",width = 8)
//    @ExcelColumn(name="人员类型" ,index = 5, valueMapping="0=劳务访客;1=普通访客;2=内部员工;3=车辆信息;",width = 8)
    private String typeName;

    @ApiModelProperty(value = "访客名称")
@@ -160,15 +160,19 @@
    private Integer categoryId;

    @ApiModelProperty(value = "关联分类名称")
    @ExcelColumn(name="车辆分类" ,index = 8,width = 16)
    private String categoryName;

    @ApiModelProperty(value = "关联父级分类编码（关联category)", example = "1")
    @ExcelColumn(name="关联父级分类编码（关联category)")
    private Integer categoryParentId;

    @ApiModelProperty(value = "关联分类名称")
    @ExcelColumn(name="关联分类名称")
    private String categoryParentName;


    @ApiModelProperty(value = "0=访客车辆;1=外协运输车辆;2=市公司卸货车辆;3=加工烟卸货车辆;4=安泰物流公务用车;5=安泰物流货运车辆;6=未知车辆 ")
    @ExcelColumn(name="车辆分类" ,index = 8,width = 16,valueMapping ="0=访客车辆;1=外协运输车辆;2=市公司卸货车辆;3=加工烟卸货车辆;4=安泰物流公务用车;5=安泰物流货运车辆;6=未知车辆;" )
    @TableField(exist = false)
    private Integer bizType;

}

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

@@ -181,6 +181,9 @@
    }
    @Override
    public  List<Category> findChileList(Category model) {
        if(Objects.isNull(model)){
            model = new Category();
        }
        model.setIsdeleted(Constants.ZERO);
        List<Category> list =findList(model);
        List<Category> data = new ArrayList<>();
@@ -194,6 +197,8 @@
                        category.setGroupName( category.getParentName()+"/"+category.getName());
                        data.add(category);
                    }
                }else{
                    data.add(category);
                }
            }
        }

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

@@ -121,7 +121,9 @@
        InoutRecord model = pageWrap.getModel();
        queryWrapper.selectAll(InoutRecord.class)
                .eq(InoutRecord::getIsdeleted,Constants.ZERO)
                .eq(Objects.nonNull(model.getType()),InoutRecord::getType, model.getType())
//                .eq(Objects.nonNull(model.getType()),InoutRecord::getType, model.getType())
                .isNotNull(Objects.nonNull(model.getType())&&Constants.equalsInteger(model.getType(),Constants.ZERO),model.getCarCode())
                .isNotNull(Objects.nonNull(model.getType())&&Constants.equalsInteger(model.getType(),Constants.ONE),model.getMemberPhone())
                .eq(Objects.nonNull(model.getInOrOut()),InoutRecord::getInOrOut, model.getInOrOut())
                .eq(Objects.nonNull(model.getObjType()),InoutRecord::getObjType, model.getObjType())
                .eq(Objects.nonNull(model.getCarBizType()),InoutRecord::getCarBizType, model.getCarBizType())

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

@@ -310,9 +310,11 @@
        queryWrapper.selectAll(Retention.class)
                .selectAs(Company::getName,Retention::getCompanyName)
                .selectAs(Company::getType,Retention::getCompanyType)
                .select(" ( SELECT v.company_name FROM visits v WHERE v.member_id = t.member_id and v.status = "+Constants.VisitStatus.signin+" ORDER BY create_date DESC limit 1 ) as visitCompanyName ");
                queryWrapper.eq(Retention::getIsdeleted,Constants.ZERO)
                        .eq(Company::getIsdeleted,Constants.ZERO)
                .select(" ( SELECT v.company_name FROM visits v WHERE v.member_id = t.member_id and v.status = "+Constants.VisitStatus.signin+" ORDER BY create_date DESC limit 1 ) as visitCompanyName ")
                .selectAs(Category::getBizType,Retention::getBizType)
                .leftJoin(Category.class,Category::getId,Retention::getCategoryId)
                .eq(Retention::getIsdeleted,Constants.ZERO)
//                        .eq(Company::getIsdeleted,Constants.ZERO)
                .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->{
                    w.like( Retention::getPhone,pageWrap.getModel().getKeyWords())
                            .or().like( Retention::getName,pageWrap.getModel().getKeyWords()); })
@@ -325,6 +327,8 @@
                        Retention::getType,Constants.FOUR)
                .eq(Objects.nonNull(pageWrap.getModel().getQueryUserType())&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.TWO),
                        Retention::getType,Constants.TWO)
                .eq(Objects.nonNull(pageWrap.getModel().getBizType()),
                        Category::getBizType,pageWrap.getModel().getBizType())
                //过滤车辆数据
                .ne(Retention::getType,3)
                .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),

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

@@ -1895,8 +1895,9 @@
//                    List<String> memberIds = daysList.stream().map(i->i.getMemberId().toString()).collect(Collectors.toList());

                    List<String> memberIds  = inoutRecordList.stream().filter(i->
                                    Objects.isNull(i.getCarCode())&&
                                    Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
                                    Objects.isNull(i.getCarCode())
                                            && Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
                                            && Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
                            )
                            .map(i->i.getMemberPhone())
                            .collect(Collectors.toList());
@@ -1919,10 +1920,11 @@
//                    List<CarEvent> daysList = carEventList.stream().filter(i->StringUtils.isNotBlank(i.getHappenTime()) && i.getHappenTime().substring(0,10).equals(days)).collect(Collectors.toList());
//                    List<String> carCodeList = daysList.stream().map(i->i.getPlateNos()).collect(Collectors.toList());
                    List<String> carCodeList  = inoutRecordList.stream().filter(i->
                                    Objects.isNull(i.getCarCode())&&
                                            Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
                                    Objects.nonNull(i.getCarCode())
                                            && Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
                                            && Objects.isNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
                            )
                            .map(i->i.getMemberPhone())
                            .map(i->i.getCarCode())
                            .collect(Collectors.toList());
                    if(CollectionUtils.isNotEmpty(carCodeList)){
                        carVO.setNum(new HashSet<String>(carCodeList).size());
@@ -1939,6 +1941,7 @@

            List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
                    .eq(Company::getIsdeleted,Constants.ZERO)
                    .orderByAsc(Company::getSortnum)
            );

            if(CollectionUtils.isNotEmpty(companyList)){