From ddf6452d487465e6fdfabc154bc46e0d2d0c6823 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 18 Jan 2024 12:26:21 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java | 2 +-
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 7 ++++++-
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 13 +++++++++----
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
index ec2cd31..a8118ba 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
@@ -52,7 +52,7 @@
* @param userId
* @return
*/
- TaskReportStatistics getStatisticsCount(@Param("userId") Long userId, @Param("houseCode") String houseCode);
+ TaskReportStatistics getStatisticsCount(@Param("userId") Long userId, @Param("houseCode") String houseCode, @Param("neiCode") String neiCode);
Integer getStatistics(Long userId,String neiCode);
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
index 028f6b4..87b7aff 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -255,10 +255,12 @@
<select id="getStatisticsCount" resultType="org.springblade.modules.task.vo.TaskReportStatistics">
- SELECT
- COUNT( 1 ) AS total,
- ifnull(SUM( CASE WHEN STATUS = 10 THEN 1 ELSE 0 END ),0) AS handle
- FROM jczz_task_report_for_repairs
+ ELECT
+ count( 1 ) AS total,
+ ifnull( sum( CASE WHEN STATUS = 10 THEN 1 ELSE 0 END ), 0 ) AS handle
+ FROM
+ jczz_task_report_for_repairs jtrfr
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jtrfr.address_code
WHERE is_deleted = 0
<if test="userId != null">
and create_user = #{userId}
@@ -267,6 +269,9 @@
<if test="houseCode != null and houseCode != ''">
and address_code = #{houseCode}
</if>
+ <if test="neiCode != null and neiCode != ''">
+ AND jda.nei_code LIKE concat( #{neiCode}, '%' )
+ </if>
</select>
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 9c9c440..f0afb84 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
@@ -90,7 +90,12 @@
*/
@Override
public TaskReportStatistics getStatisticsCount(String houseCode) {
- return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode);
+ String neiCode = "";
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null != dept) {
+ neiCode = dept.getRegionCode();
+ }
+ return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode, neiCode);
}
/**
--
Gitblit v1.9.3