From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 26 ++++++--------------------
1 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
index b1ac1b2..f05ef39 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
@@ -128,7 +128,7 @@
@Override
public Sites findOne(Sites sites) {
QueryWrapper<Sites> wrapper = new QueryWrapper<>(sites);
- return sitesMapper.selectOne(wrapper);
+ return sitesMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
@@ -166,10 +166,10 @@
queryWrapper.lambda().eq(Sites::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Sites::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(Sites::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(Sites::getCode, pageWrap.getModel().getCode());
+ queryWrapper.lambda().like(Sites::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(Sites::getStatus, pageWrap.getModel().getStatus());
@@ -201,13 +201,12 @@
@Override
public PageData<Sites> findSitesMonitorDTOPage(PageWrap<SitesMonitorDTO> pageWrap) {
-
// IPage page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
IPage<Sites> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Sites> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.select("*,(select count(r.id) from locks r where r.site_id = sites.id) as localCount" +
- ",(select count(r.bike_code) from locks r where r.site_id = sites.id and r.bike_code is null and r.bike_code !='' ) as bikeCount");
+ queryWrapper.select("*,(select count(r.id) from locks r where r.site_id = sites.id) as all_lock_num" +
+ ",(select count(r.bike_code) from locks r where r.site_id = sites.id and r.bike_code is null and r.bike_code !='' ) as bikeCount");
// Page<SitesMonitorDTO> sitesMonitorDTO = sitesMapper.getSitesMonitorDTO(page, pageWrap.getModel().getCode(), pageWrap.getModel().getName());
queryWrapper.lambda().like(StringUtils.isNotBlank(pageWrap.getModel().getCode()),Sites::getCode,pageWrap.getModel().getCode());
queryWrapper.lambda().like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Sites::getCode,pageWrap.getModel().getName());
@@ -216,7 +215,7 @@
if (!CollectionUtils.isEmpty(sitesMonitorDTO.getRecords())){
sitesMonitorDTO.getRecords().forEach(s->{
- s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getLocalCount()).setScale(2)));
+ s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getAllLockNum()),BigDecimal.ROUND_UP).setScale(2));
});
}
@@ -226,18 +225,5 @@
@Override
public void siteReservesNotice(String siteId) throws Exception {
- }
-
- @Override
- public PageData<SitesMonitorBikeDTO> getSitesMonitorBikeDTO(PageWrap<SitesMonitorDTO> pageWrap) {
- IPage page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- Page<SitesMonitorBikeDTO> sitesMonitorDTO = sitesMapper.getSitesMonitorBikeDTO(page,
- pageWrap.getModel().getCode(),
- pageWrap.getModel().getName(),
- pageWrap.getModel().getLockCode(),
- pageWrap.getModel().getHasBike());
-
-
- return PageData.from(sitesMonitorDTO);
}
}
--
Gitblit v1.9.3