报表数据

rk

2026-03-13 0e997dbbfeacaf72e91380d035265836b8df8a7d

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

@@ -360,10 +360,10 @@

    @Override
    public List<Cars> findList(Cars cars) {
        if(Objects.nonNull(cars) && Objects.nonNull(cars.getType())
        && Constants.equalsInteger(Constants.ZERO,cars.getType())){
            return this.getGwCar();
        }
//        if(Objects.nonNull(cars) && Objects.nonNull(cars.getType())
//        && Constants.equalsInteger(Constants.ZERO,cars.getType())){
//            return this.getGwCar();
//        }
        cars.setType(null);
        QueryWrapper<Cars> wrapper = new QueryWrapper<>(cars);
        wrapper.lambda().eq(Cars::getIsdeleted,Constants.ZERO);
@@ -727,6 +727,9 @@
        if(StringUtils.isEmpty(op)){
            return;
        }
        if(op.equals("data_test")){
            return;
        }
        JSONObject dataJSON = dataInfoJSON.getJSONObject("data");
        String no = dataJSON.getString("_id");
        if(StringUtils.isEmpty(no)){
@@ -755,7 +758,7 @@
        cars.setCode(StringUtils.isBlank(carCode)?null:carCode);
        cars.setStatus(StringUtils.isNotBlank(status)&&StringUtils.equals(status,"可用")?0:1);
        JSONObject driverJSON = dataJSON.getJSONObject("driver");
        if(!driverJSON.isEmpty()){
        if(Objects.nonNull(driverJSON)){
            String driverName = driverJSON.getString("name");
            String driverUserName = driverJSON.getString("username");
            if(StringUtils.isNotBlank(driverUserName)){
@@ -765,17 +768,17 @@
                }
            }
        }
        JSONObject createJSON = dataJSON.getJSONObject("creator");
        if(!createJSON.isEmpty()){
            String createName = createJSON.getString("name");
            String createUserName = createJSON.getString("username");
            if(StringUtils.isNotBlank(createUserName)){
                Member createMember = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getDdId,createUserName).last("limit 1 "));
                if(Objects.nonNull(createMember)){
                    cars.setMemberId(createMember.getId());
                }
            }
        }
//        JSONObject createJSON = dataJSON.getJSONObject("creator");
//        if(Objects.nonNull(createJSON)){
//            String createName = createJSON.getString("name");
//            String createUserName = createJSON.getString("username");
//            if(StringUtils.isNotBlank(createUserName)){
//                Member createMember = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getDdId,createUserName).last("limit 1 "));
//                if(Objects.nonNull(createMember)){
//                    cars.setMemberId(createMember.getId());
//                }
//            }
//        }
        carsMapper.insertOrUpdate(cars);
    }