From f0a6462c539e217186d6fee31dfec6d2aba2e92a Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 22 四月 2025 09:09:32 +0800
Subject: [PATCH] 点位在线率
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
index 5921403..0db7f41 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
@@ -225,9 +225,9 @@
@Override
@SneakyThrows
- public void export(Integer calculateId,Integer contractId, HttpServletResponse response) {
+ public void export(Integer whichYear,Integer whichMonth,Integer contractId, HttpServletResponse response) {
// 鑾峰彇鏁版嵁
- List<CalculateExport> list = baseMapper.exportData(calculateId);
+ List<CalculateExport> list = baseMapper.exportData(whichYear,whichMonth,contractId);
CalculateExport calculateExport = new CalculateExport();
calculateExport.setRuleName("鍚堣");
calculateExport.setNum(list.stream().mapToInt(CalculateExport::getNum).sum());
@@ -238,6 +238,11 @@
.add(BigDecimal.valueOf(100)) // 鍔犱笂100
.setScale(1, RoundingMode.HALF_UP));
list.add(calculateExport);
+ list.forEach(item->{
+ if("纭繚褰曞儚瀹屾暣涓嶅畾鏈熷鎵�鏈夌偣浣嶅綍鍍忓畬鏁存�ф娊鏌�".equals(item.getRuleName())){
+ item.setNum(item.getScore().abs().divide(item.getCalcFraction(),0,RoundingMode.HALF_UP).intValue());
+ }
+ });
// 鑾峰彇瑙勫垯
List<CalculateRule> ruleList = calculateRuleService.list(new LambdaQueryWrapper<CalculateRule>().eq(CalculateRule::getContractId, contractId));
// 杈撳嚭鏂囦欢
--
Gitblit v1.8.0