From 038f3e14174a00a111d489d5cf1b724275fe33da Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 28 Nov 2023 18:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 68 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 2 deletions(-)
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 17150fa..3a4a810 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -17,9 +17,73 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
+ <!--自定义分页查询-->
+ <select id="selectTaskReportForRepairsPage" resultType="org.springblade.modules.task.vo.TaskReportForRepairsVO">
+ select
+ jtrfr.*,
+ jda.address_name as addressName
+ from jczz_task_report_for_repairs jtrfr
+ left join jczz_doorplate_address jda on jda.address_code = jtrfr.address_code
+ where jtrfr.is_deleted = 0
+ <if test="vo.createUser != null and vo.createUser != ''">
+ AND jtrfr.create_user = #{vo.createUser}
+ </if>
+ <if test="vo.type != null">
+ AND jtrfr.type = #{vo.type}
+ </if>
+ <if test="vo.realName != null and vo.realName != ''">
+ AND jtrfr.real_name like concat('%',#{vo.realName},'%')
+ </if>
+ <if test="vo.phone != null and vo.phone != ''">
+ AND jtrfr.phone like concat('%',#{vo.phone},'%')
+ </if>
+ <if test="vo.confirmFlag != null">
+ AND jtrfr.confirm_flag = #{vo.confirmFlag}
+ </if>
+ <if test="vo.roleName!=null and vo.roleName!=''">
+ <if test="vo.roleName=='网格员'">
+ <choose>
+ <when test="list != null and list.size()>0">
+ and jda.address_code in
+ <foreach collection="list" item="houseCode" separator ="," open="(" close=")">
+ #{houseCode}
+ </foreach>
+ </when>
+ <otherwise>
+ and jda.address_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ </if>
+ ORDER BY jtrfr.create_time DESC
+ </select>
- <select id="selectTaskReportForRepairsPage" resultMap="taskReportForRepairsResultMap">
- select * from jczz_task_report_for_repairs where is_deleted = 0
+ <!--统计查询，个人-->
+ <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
+ WHERE is_deleted = 0
+ <if test="userId != null">
+ and create_user = #{userId}
+ </if>
+ </select>
+
+
+ <select id="getStatistics" resultType="java.lang.Integer">
+
+ SELECT
+ count(1)
+ FROM
+ jczz_grid_range jgr
+ LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_task_report_for_repairs jtr on jtr.address_code=jgr.house_code
+ WHERE
+ jg.is_deleted = 0
+ and jtr.confirm_flag = 1
+ AND jg.user_id = #{userId}
+
</select>
--
Gitblit v1.9.3