From 372713d9d50c73871d51fd98b655d8bd9e24df46 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 02 一月 2024 10:56:13 +0800
Subject: [PATCH] 1.2

---
 guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/HouseController.java |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/HouseController.java b/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/HouseController.java
index 20f8267..5935480 100644
--- a/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/HouseController.java
+++ b/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/HouseController.java
@@ -66,32 +66,32 @@
 
         List<Integer> data = new ArrayList<>();
         //总房源
-        Integer one = houseResourceService.selectCount(new EntityWrapper<HouseResource>().eq("is_delete", 0));
+        Integer one = houseResourceService.selectCount(new EntityWrapper<HouseResource>().eq("type",2).eq("auth_status",2));
         data.add(one);
         //总出租房源
-        Integer two = houseResourceService.selectCount(new EntityWrapper<HouseResource>().eq("is_delete", 0).eq("data_type",1));
+        Integer two = houseResourceService.selectCount(new EntityWrapper<HouseResource>().eq("type",2).eq("data_type",1).eq("auth_status",2));
         data.add(two);
         //总卖房源
-        Integer three = houseResourceService.selectCount(new EntityWrapper<HouseResource>().eq("is_delete", 0).eq("data_type",2));
+        Integer three = houseResourceService.selectCount(new EntityWrapper<HouseResource>().eq("type",2).eq("data_type",2).eq("auth_status",2));
         data.add(three);
         //总求买房
-        Integer four = demandService.selectCount(new EntityWrapper<HousingDemand>().eq("is_delete", 0).eq("data_type",2));
+        Integer four = demandService.selectCount(new EntityWrapper<HousingDemand>().eq("data_type",2));
         data.add(four);
         //总求租房
-        Integer five = demandService.selectCount(new EntityWrapper<HousingDemand>().eq("is_delete", 0).eq("data_type",1));
+        Integer five = demandService.selectCount(new EntityWrapper<HousingDemand>().eq("data_type",1));
         data.add(five);
         //总中介
-        Integer six = appUserService.selectCount(new EntityWrapper<AppUser>().eq("user_type",3).ne("status",3));
+        Integer six = appUserService.selectCount(new EntityWrapper<AppUser>().eq("user_type",3).eq("auth",2).ne("status",3));
         data.add(six);
         //总房东
-        Integer seven = appUserService.selectCount(new EntityWrapper<AppUser>().eq("user_type",3).ne("status",2));
+        Integer seven = appUserService.selectCount(new EntityWrapper<AppUser>().eq("user_type",2).ne("status",2));
         data.add(seven);
         //总用户
-        Integer eight = appUserService.selectCount(new EntityWrapper<AppUser>().ne("status",2));
+        Integer eight = appUserService.selectCount(new EntityWrapper<AppUser>().ne("status",3));
         data.add(eight);
         //今日新增中介
         Integer nine = appUserService.selectCount(new EntityWrapper<AppUser>()
-                .eq("user_type", 3)
+                .eq("user_type", 3).eq("auth",2)
                 .ne("status", 3)
                 .like("changeTime", formattedDate));
         data.add(nine);
@@ -105,16 +105,16 @@
         Integer eleven = appUserService.selectCount(new EntityWrapper<AppUser>().ne("status",3).like("insert_time", formattedDate));
         data.add(eleven);
         //今日新增房源出租
-        Integer twelve = houseResourceService.selectCount(new EntityWrapper<HouseResource>().eq("is_delete", 0).ne("type",1).eq("data_type",1).like("auth_time", formattedDate));
+        Integer twelve = houseResourceService.selectCount(new EntityWrapper<HouseResource>().ne("type",1).eq("data_type",1).like("auth_time", formattedDate));
         data.add(twelve);
         //今日卖房源
-        Integer thirteen = houseResourceService.selectCount(new EntityWrapper<HouseResource>().eq("is_delete", 0).ne("type",1).eq("data_type",2).like("auth_time", formattedDate));
+        Integer thirteen = houseResourceService.selectCount(new EntityWrapper<HouseResource>().ne("type",1).eq("data_type",2).like("auth_time", formattedDate));
         data.add(thirteen);
         //今日求租房
-        Integer fourteen = demandService.selectCount(new EntityWrapper<HousingDemand>().eq("is_delete", 0).ne("type",1).eq("data_type",1).like("insert_time", formattedDate));
+        Integer fourteen = demandService.selectCount(new EntityWrapper<HousingDemand>().ne("type",1).eq("data_type",1).like("insert_time", formattedDate));
         data.add(fourteen);
         //今日求买房
-        Integer fifteen = demandService.selectCount(new EntityWrapper<HousingDemand>().eq("is_delete", 0).ne("type",1).eq("data_type",2).like("insert_time", formattedDate));
+        Integer fifteen = demandService.selectCount(new EntityWrapper<HousingDemand>().ne("type",1).eq("data_type",2).like("insert_time", formattedDate));
         data.add(fifteen);
 
         return data;
@@ -177,7 +177,7 @@
         HouseResource houseResource = houseResourceService.selectById(id);
         AddHouseReq addHouseReq = new AddHouseReq();
         BeanUtils.copyProperties(houseResource,addHouseReq);
-        addHouseReq.setTime(houseResource.getLeaseTime());
+//        addHouseReq.setTime(houseResource.getLeaseTime());
         return addHouseReq;
     }
 
@@ -291,6 +291,7 @@
             houseResource.setAuthTime(new Date());
             houseResource.setReason(reason);
             houseResource.setAuthStatus(3);
+            houseResource.setStatus(1);
         }
         houseResourceService.updateById(houseResource);
 

--
Gitblit v1.7.1