From 91a2131482a50fc11dd48228a766c28123a1a435 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 03 十一月 2023 16:19:21 +0800
Subject: [PATCH] # 空字符串判断
---
server/services/src/main/java/com/doumee/dao/business/SitesMapper.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/SitesMapper.java b/server/services/src/main/java/com/doumee/dao/business/SitesMapper.java
index 0fbb35b..0b5adf9 100644
--- a/server/services/src/main/java/com/doumee/dao/business/SitesMapper.java
+++ b/server/services/src/main/java/com/doumee/dao/business/SitesMapper.java
@@ -1,8 +1,13 @@
package com.doumee.dao.business;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.dao.business.model.Sites;
+import com.doumee.dao.business.web.request.SitesMonitorBikeDTO;
import com.doumee.dao.business.web.request.SitesMonitorDTO;
+import com.doumee.dao.system.dto.QuerySystemUserDTO;
+import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/**
@@ -15,16 +20,12 @@
/**
* @return
*/
- @Select("SELECT \n" +
- "sites.id,\n" +
- "sites.name as name,\n" +
- "sites.code as code,\n" +
- "count(l.id) as lid,\n" +
- "count(l.bike_code ) as lbikeCount\n" +
- "from \n" +
- "sites sites\n" +
- "LEFT JOIN locks l on sites.id = l.site_id\n" +
- "GROUP BY sites.id ")
- SitesMonitorDTO getSitesMonitorDTO();
+ Page<SitesMonitorDTO> getSitesMonitorDTO(IPage page, @Param("code") String code, @Param("name") String name);
+
+ Page<SitesMonitorBikeDTO> getSitesMonitorBikeDTO(IPage page,
+ @Param("code") String code,
+ @Param("name") String name,
+ @Param("lockCode") String lockCode,
+ @Param("hasBike") Boolean hasBike );
}
--
Gitblit v1.9.3