From 29cd606f6e2c614f765aa043435e6ca110c5c6cf Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 16 八月 2024 18:14:27 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
index cb3c94c..552bbf5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
@@ -2,14 +2,17 @@
 
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.PlatformMapper;
 import com.doumee.dao.business.model.Platform;
+import com.doumee.dao.business.model.PlatformGroup;
 import com.doumee.service.business.PlatformService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -87,9 +90,13 @@
     @Override
     public PageData<Platform> findPage(PageWrap<Platform> pageWrap) {
         IPage<Platform> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
-        QueryWrapper<Platform> queryWrapper = new QueryWrapper<>();
+        MPJLambdaWrapper<Platform> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper.selectAll(Platform.class)
+                    .selectAs(PlatformGroup::getName,Platform::getGroupName)
+                    .leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId);
         Utils.MP.blankToNull(pageWrap.getModel());
-        queryWrapper.lambda()
+        pageWrap.getModel().setIsdeleted(Constants.ZERO);
+        queryWrapper
                 .eq(pageWrap.getModel().getId() != null, Platform::getId, pageWrap.getModel().getId())
                 .eq(pageWrap.getModel().getCreator() != null, Platform::getCreator, pageWrap.getModel().getCreator())
                 .ge(pageWrap.getModel().getCreateDate() != null, Platform::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
@@ -106,7 +113,6 @@
                 .eq(pageWrap.getModel().getStartTime() != null, Platform::getStartTime, pageWrap.getModel().getStartTime())
                 .eq(pageWrap.getModel().getEndTime() != null, Platform::getEndTime, pageWrap.getModel().getEndTime())
                 .eq(pageWrap.getModel().getWorkingNum() != null, Platform::getWorkingNum, pageWrap.getModel().getWorkingNum())
-                .eq(pageWrap.getModel().getWariCallTime() != null, Platform::getWariCallTime, pageWrap.getModel().getWariCallTime())
                 .eq(pageWrap.getModel().getAlermTime() != null, Platform::getAlermTime, pageWrap.getModel().getAlermTime())
                 .ge(pageWrap.getModel().getLastEventTime() != null, Platform::getLastEventTime, Utils.Date.getStart(pageWrap.getModel().getLastEventTime()))
                 .le(pageWrap.getModel().getLastEventTime() != null, Platform::getLastEventTime, Utils.Date.getEnd(pageWrap.getModel().getLastEventTime()))
@@ -127,7 +133,7 @@
                 queryWrapper.orderByAsc(sortData.getProperty());
             }
         }
-        return PageData.from(platformMapper.selectPage(page, queryWrapper));
+        return PageData.from(platformMapper.selectJoinPage(page,Platform.class, queryWrapper));
     }
 
     @Override

--
Gitblit v1.9.3