Merge remote-tracking branch 'origin/master'

k94314517

2025-05-07 94fdc01dacf7a3bc185ca99e98d0864594d34ef1

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

@@ -689,7 +689,7 @@
        if(Constants.equalsInteger(visits.getType(),Constants.ZERO)
             ||  Constants.equalsInteger(visits.getType(),Constants.ONE)){
            if(  visits.getIdcardType() == null
                    ||  StringUtils.isBlank( visits.getIdcardNo() ) || StringUtils.isBlank(visits.getFaceImg()) ){
                    || StringUtils.isBlank(visits.getFaceImg()) ){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，信息填写不正确！");
            }
        }
@@ -1867,20 +1867,20 @@
            List<InterestedListVO> lwList = new ArrayList<>();
            List<InterestedListVO> internalList = new ArrayList<>();
            //查询七天前的访客记录数量
            List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().in(Visits::getStatus,
                    Constants.VisitStatus.signin,Constants.VisitStatus.signout)
                    .apply(" STARTTIME >   CURDATE() - INTERVAL 7 DAY " )
            );
//            List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().in(Visits::getStatus,
//                    Constants.VisitStatus.signin,Constants.VisitStatus.signout)
//                    .apply(" STARTTIME >   CURDATE() - INTERVAL 7 DAY " )
//            );

            List<InoutRecord> inoutRecordList = inoutRecordMapper.selectList(new QueryWrapper<InoutRecord>().lambda()
                    .eq(InoutRecord::getInOrOut,Constants.ZERO).eq(InoutRecord::getIsdeleted,Constants.ZERO)
                    .apply(" STARTTIME >   CURDATE() - INTERVAL 7 DAY " )
                    .apply(" TIME_INFO >   CURDATE() - INTERVAL 7 DAY " )
            );

            List<CarEvent> carEventList = carEventMapper.selectList(new QueryWrapper<CarEvent>().lambda()
                    .in(CarEvent::getEventType,"771760131","771760130")
                    .apply(" STR_TO_DATE(happen_time, '%Y-%m-%dT%H:%i:%s') > CURDATE() - INTERVAL 7 DAY  " )
            );
//            List<CarEvent> carEventList = carEventMapper.selectList(new QueryWrapper<CarEvent>().lambda()
//                    .in(CarEvent::getEventType,"771760131","771760130")
//                    .apply(" STR_TO_DATE(happen_time, '%Y-%m-%dT%H:%i:%s') > CURDATE() - INTERVAL 7 DAY  " )
//            );

            for (String days:weekDays) {
                InterestedListVO visitVO = new InterestedListVO();
@@ -1933,11 +1933,8 @@
            pcWorkPlatformDataVO.setWeekCarList(weekCarList);

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



            if(CollectionUtils.isNotEmpty(companyList)){
                List<Company>  lwCompanyList  = companyList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());