From eb6f955d00d0d3a05f77272d11520f5818d6b802 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 20 十一月 2024 15:18:44 +0800
Subject: [PATCH] 初始化版本

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
index 4634b2e..5e27677 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
@@ -99,6 +99,7 @@
 
     @Override
     public List<YwProject> findList(YwProject ywProject) {
+        ywProject.setIsdeleted(Constants.ZERO);
         QueryWrapper<YwProject> wrapper = new QueryWrapper<>(ywProject);
         return ywProjectMapper.selectList(wrapper);
     }
@@ -108,6 +109,9 @@
         IPage<YwProject> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         QueryWrapper<YwProject> queryWrapper = new QueryWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
+        pageWrap.getModel().setIsdeleted(Constants.ZERO);
+        queryWrapper.select("*,(select count(1) from yw_room a where a.isdeleted=0 and a.PROJECT_ID=yw_project.id) as roomNum"+
+                ",(select count(1) from yw_room a where a.isdeleted=0 and a.PROJECT_ID=yw_project.id and a.IS_INVESTMENT=1) as roomRentNum");
         if (pageWrap.getModel().getId() != null) {
             queryWrapper.lambda().eq(YwProject::getId, pageWrap.getModel().getId());
         }
@@ -149,13 +153,7 @@
         if (pageWrap.getModel().getAddr() != null) {
             queryWrapper.lambda().eq(YwProject::getAddr, pageWrap.getModel().getAddr());
         }
-        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
-            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
-                queryWrapper.orderByDesc(sortData.getProperty());
-            } else {
-                queryWrapper.orderByAsc(sortData.getProperty());
-            }
-        }
+        queryWrapper.lambda().orderByDesc(YwProject::getCreateDate);
         return PageData.from(ywProjectMapper.selectPage(page, queryWrapper));
     }
 

--
Gitblit v1.9.3