44323
2024-01-30 f46687ac5de2f79a277efba1f3c1f9e224cbf623
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java
@@ -214,6 +214,11 @@
                    .collect(Collectors.toList());
            searchHouseResourceListRes = collect;
            searchHouseResourceListRes.addAll(collect1);
        }else{
            List<SearchHouseResourceListRes> collect = searchHouseResourceListRes.stream()
                    .sorted(Comparator.comparing(SearchHouseResourceListRes::getInsertTime).reversed())
                    .collect(Collectors.toList());
            searchHouseResourceListRes = collect;
        }
        searchHouseResource.setList(searchHouseResourceListRes);
@@ -494,7 +499,7 @@
            // todo 修改回审核和上下架状态
            houseResource.setStatus(1);
            houseResource.setDataType(req.getDataType());
            houseResource.setAuthStatus(1);
            houseResource.setAuthStatus(2);
            houseResource.setLeaseTime(req.getTime());
            houseResource.setAppUserId(appUserId);
            houseResource.setFirmHouse(req.getFirmHouse());
@@ -507,17 +512,21 @@
            }
            if (req.getType()==2){
                if (req.getId()==null){
                    houseResource.setAuthTime(new Date());
                    houseResource.setAuthStatus(2);
                    this.baseMapper.insert(houseResource);
                }else{
                    houseResource.setAuthTime(new Date());
                    houseResource.setAuthStatus(2);
                    this.baseMapper.updateById(houseResource);
                }
            }else{
                if (req.getId()==null){
                    houseResource.setAuthTime(new Date());
                    houseResource.setAuthStatus(2);
                    this.baseMapper.insert(houseResource);
                }else{
                    houseResource.setAuthTime(new Date());
                    houseResource.setAuthStatus(2);
                    this.baseMapper.updateById(houseResource);
                }
@@ -530,6 +539,7 @@
                mongoTemplate.insert(pointLocation);
                houseResource.setCode(pointLocation.getId());
                houseResource.setAuthStatus(2);
                houseResource.setAuthTime(new Date());
                this.baseMapper.updateById(houseResource);
                InputStream inputStream = null;
                OutputStream outputStream = null;