From d3ca2cb702a3574d67c58cef63a2cfeccf214169 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 24 六月 2024 15:53:50 +0800
Subject: [PATCH] 问题修改
---
project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java b/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java
index b02da7c..c8fa078 100644
--- a/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java
+++ b/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java
@@ -51,7 +51,7 @@
public Map<String, Object> getTotalInfo()
{
int companyNum = companyService.count(companyService.lq().eq(SysCompany::getCompanyStatus, 0));
- int enforceCompanyNum = orderService.count(orderService.lq().groupBy(EnforceOrder::getCompanyId));
+ int enforceCompanyNum = orderService.getDistinctCompanyNum();
int enforceDeptNum = deptService.count(deptService.lq().eq(SysDept::getParentId,100));
int enforceUserNum = userService.count(userService.lq().ne(SysUser::getUserType,"02"));
int enforceOrderNum = orderService.count();
@@ -99,20 +99,7 @@
@Override//浼佷笟琚墽娉曟鏁板垎甯�
public List<KeyVal> getCompanyCount(ReportQueryBo bo)
{
- List<KeyVal> list = reportMapper.getCompanyCount(bo);
- Map<String, Object> resultMap = list.stream().collect(Collectors.toMap(KeyVal::getK, KeyVal::getV));
-
- List<SysCompany> companies = companyService.list(companyService.lq().eq(SysCompany::getCompanyStatus, 0));
-
- return companies.stream().map(e -> {
- KeyVal keyVal;
- if (resultMap.get(e.getCompanyId().toString()) == null) {
- keyVal = new KeyVal(e.getCompanyName(), 0);
- } else {
- keyVal = new KeyVal(e.getCompanyName(), resultMap.get(e.getCompanyId().toString()));
- }
- return keyVal;
- }).collect(Collectors.toList());
+ return reportMapper.getCompanyCount(bo);
}
@Override//鎵ф硶绫诲瀷
@@ -177,10 +164,10 @@
{
return dictDataList.stream().map(e -> {
KeyVal keyVal;
- if (resultMap.get(e.getDictValue()) == null) {
+ if (resultMap.get(e.getDictCode().toString()) == null) {
keyVal = new KeyVal(e.getDictLabel(), 0);
} else {
- keyVal = new KeyVal(e.getDictLabel(), resultMap.get(e.getDictValue()));
+ keyVal = new KeyVal(e.getDictLabel(), resultMap.get(e.getDictCode().toString()));
}
return keyVal;
}).collect(Collectors.toList());
--
Gitblit v1.9.1