From 65f4876957d95740104b49af7ead3a2d0c2156b6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 十月 2023 14:04:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 7fdb63f..d3c549d 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
@@ -205,17 +205,20 @@
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" +
- queryWrapper.select("*,(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());
queryWrapper.lambda().orderByAsc(Sites::getCode);
IPage<Sites> sitesMonitorDTO = sitesMapper.selectPage(page, queryWrapper);
-
if (!CollectionUtils.isEmpty(sitesMonitorDTO.getRecords())){
sitesMonitorDTO.getRecords().forEach(s->{
- s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getLockNum()).setScale(2)));
+ if(Constants.formatIntegerNum(s.getAllLockNum()) >0){
+ s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getAllLockNum()),BigDecimal.ROUND_UP).setScale(2));
+ }else{
+ s.setRate(new BigDecimal(0.0));
+ }
});
}
--
Gitblit v1.9.3