From bf2e12960298029e923d32b5e9ea11edb784d67a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 14:16:28 +0800
Subject: [PATCH] 办结率bug修复
---
src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java | 2 +-
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java b/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java
index 7fafe29..4ead02d 100644
--- a/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java
+++ b/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java
@@ -112,7 +112,7 @@
long count = ownersCommitteeService.count(Wrappers.<OwnersCommitteeMemberEntity>lambdaQuery()
.eq(OwnersCommitteeMemberEntity::getAreaId, ownersCommittee.getAreaId())
.eq(OwnersCommitteeMemberEntity::getUserId, ownersCommittee.getUserId()));
- if (count > 0) {
+ if (count > 0 && ownersCommittee.getId() != null) {
return R.fail("该业委会成员已存在");
}
return R.status(ownersCommitteeService.saveOrUpdate(ownersCommittee));
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
index 9f42a04..d0ac5cd 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -172,7 +172,7 @@
Map<String, Object> objectObjectHashMap = new HashMap<>();
if (roleType.equals("2")) {
Integer result1 = baseMapper.getReportForStatistics(code, null, null, null, roleType);
- Integer result = baseMapper.getReportForStatistics(code, null, 1, null, roleType);
+ Integer result = baseMapper.getReportForStatistics(code, null, 3, null, roleType);
objectObjectHashMap.put("result", result1);
objectObjectHashMap.put("result1", result);
objectObjectHashMap.put("result2", result1.equals(0) ? 0 : BigDecimal.valueOf(result).divide(BigDecimal.valueOf(result1), 2, BigDecimal.ROUND_HALF_UP));
@@ -182,7 +182,7 @@
objectObjectHashMap.put("result6", baseMapper.getReportForStatistics(code, null, null, 4, roleType));
} else {
Integer result1 = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, null, roleType);
- Integer result = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), 1, null, roleType);
+ Integer result = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), 3, null, roleType);
// result 总数 result1 已处理 result2 处理率 result3 公共维修 result4 居家维修 result5 矛盾纠纷 result6 投诉举报
objectObjectHashMap.put("result", result1);
objectObjectHashMap.put("result1", result);
--
Gitblit v1.9.3