From 9c348b05a774adf47453780cf3b7a8f9823661f5 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 26 六月 2024 18:30:19 +0800
Subject: [PATCH] 企业多手机号
---
project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java | 42 ++++++++++++++++--------------------------
1 files changed, 16 insertions(+), 26 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 67d2fad..79edb73 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
@@ -53,22 +53,25 @@
int companyNum = companyService.count(companyService.lq().eq(SysCompany::getCompanyStatus, 0));
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 enforceUserNum = userService.count(userService.lq()
+ .ne(SysUser::getUserType,"02")
+ .ne(SysUser::getUserName,"admin")
+ );
int enforceOrderNum = orderService.count();
int enforceOrderCheckedNum = orderService.count(orderService.lq().eq(EnforceOrder::getOrderStatus,2));
int enforceOrderCompleteNum = orderService.count(orderService.lq().eq(EnforceOrder::getOrderStatus,4));
int complaintNum = complaintLogService.count();
int docNum = docService.count(docService.lq().eq(SysDoc::getDocStatus,0));
Map<String, Object> result = new HashMap<>(7);
- result.put("companyNum", companyNum);
- result.put("enforceCompanyNum", enforceCompanyNum);
- result.put("enforceDeptNum", enforceDeptNum);
- result.put("enforceUserNum", enforceUserNum);
- result.put("enforceOrderNum", enforceOrderNum);
- result.put("enforceOrderCheckedNum", enforceOrderCheckedNum);
- result.put("enforceOrderCompleteNum", enforceOrderCompleteNum);
- result.put("complaintNum", complaintNum);
- result.put("docNum", docNum);
+ result.put("companyNum", companyNum); //浼佷笟鏁�
+ result.put("enforceCompanyNum", enforceCompanyNum);//琚墽娉曚紒涓氭暟
+ result.put("enforceDeptNum", enforceDeptNum);//鎵ф硶鍗曚綅
+ result.put("enforceUserNum", enforceUserNum);//鎵ф硶浜哄憳
+ result.put("enforceOrderNum", enforceOrderNum);//鎵ф硶鍗曟�绘暟
+ result.put("enforceOrderCheckedNum", enforceOrderCheckedNum);//宸插鎵规墽娉曞崟鏁�
+ result.put("enforceOrderCompleteNum", enforceOrderCompleteNum);//鎵ф硶鍗曞畬鎴愭暟
+ result.put("complaintNum", complaintNum);//鎶曡瘔鏁�
+ result.put("docNum", docNum);//鏀跨瓥鏁�
return result;
}
@@ -99,20 +102,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 +167,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