From 72132d18936aa86039963fc04894ce189d5a2660 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Tue, 18 Jun 2024 18:37:50 +0800
Subject: [PATCH] 湖北水库：施工：修复项目进度计算百分比报错
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
index a503ac6..00eb1fb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -11,6 +11,7 @@
import cn.gistack.sm.sg.service.SgProjectInfoService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
@@ -105,7 +106,7 @@
v1 = BigDecimal.valueOf(overList.size());
}
BigDecimal v2 = BigDecimal.valueOf(deviceList.size());
- BigDecimal percentage = v1.divide(v2).multiply(new BigDecimal("100"));
+ BigDecimal percentage = v1.divide(v2,2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
// 如果不需要保留小数位，可以设置一个scale为0
BigDecimal percentageRounded = percentage.setScale(0, RoundingMode.HALF_UP);
sgProjectInfoVO.setProgressName(percentageRounded+"%");
@@ -117,7 +118,16 @@
@Override
public Map<String, Long> projectCount(ProjectSearchDTO searchDTO) {
Map<String, Long> map = new HashMap<>();
- List<SgProjectInfoDO> list = new LambdaQueryChainWrapper<>(sgProjectInfoMapper).list();
+ LambdaQueryChainWrapper<SgProjectInfoDO> wrapper = new LambdaQueryChainWrapper<>(sgProjectInfoMapper);
+ String projectName = searchDTO.getProjectName();
+ Integer status = searchDTO.getStatus();
+ if (StringUtils.isNotBlank(projectName)){
+ wrapper.like(SgProjectInfoDO::getProjectName,searchDTO.getProjectName());
+ }
+ if (status!=null){
+ wrapper.eq(SgProjectInfoDO::getStatus,searchDTO.getStatus());
+ }
+ List<SgProjectInfoDO> list = wrapper.list();
List<SgProjectInfoDO> pending = list.stream().filter(s -> s.getStatus() == 0).collect(Collectors.toList());
List<SgProjectInfoDO> progress = list.stream().filter(s -> s.getStatus() == 1).collect(Collectors.toList());
List<SgProjectInfoDO> over = list.stream().filter(s -> s.getStatus() == 2).collect(Collectors.toList());
--
Gitblit v1.9.3