From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 121 +++++++++++++++++++++++++++++++++++++---
1 files changed, 112 insertions(+), 9 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 d44bee5..c000980 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -17,21 +17,101 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
-
- <select id="selectTaskReportForRepairsPage" resultMap="taskReportForRepairsResultMap">
- select * from jczz_task_report_for_repairs where is_deleted = 0
+ <!--自定义分页查询-->
+ <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 create_user = #{vo.createUser}
+ AND jtrfr.create_user = #{vo.createUser}
</if>
- <if test="vo.type != null and vo.type != ''">
- AND type = #{vo.type}
+ <if test="vo.type != null">
+ AND jtrfr.type = #{vo.type}
</if>
- ORDER BY create_time DESC
+ <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.status != null">
+ AND jtrfr.status = #{vo.status}
+ </if>
+ <if test="vo.viewType != null">
+ AND jtrfr.view_type = #{vo.viewType}
+ </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="getReportForStatistics" resultType="java.lang.Integer">
+
+ SELECT
+ COUNT( 1 )
+ FROM
+ jczz_task_report_for_repairs jtrfr
+ LEFT JOIN jczz_doorplate_address jda ON jtrfr.address_code = jda.address_code
+ WHERE
+ jda.nei_code = #{code}
+ AND jtrfr.is_deleted = 0
+ <if test="status != null">
+ and jtrfr.confirm_flag = #{status}
+ </if>
+ <if test="type != null">
+ and jtrfr.type = #{type}
+ </if>
+
+ <if test="userId != null and roleType == '1'">
+ AND jda.address_code IN (
+ SELECT DISTINCT
+ jgr.house_code
+ FROM
+ jczz_grid jg
+ LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+ LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+ WHERE
+ jgm.user_id = #{userId}
+ AND jg.is_deleted = 0
+ )
+ </if>
+ <if test="userId != null and roleType == '3'">
+ AND jda.address_code IN (SELECT
+ jda.address_code
+ FROM
+ jczz_doorplate_address jda
+ LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+ WHERE
+ jc.res_police_user_id = #{userId})
+ )
+ </if>
+ </select>
+
+
<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
+ 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">
@@ -40,4 +120,27 @@
</select>
+ <select id="getStatistics" resultType="java.lang.Integer">
+
+ SELECT
+ count(1)
+ FROM
+ jczz_gridman jgm
+ LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
+ LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_task_report_for_repairs jtr ON jgr.house_code = jtr.address_code
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jtr.address_code
+ WHERE
+ jg.is_deleted = 0
+ and jtr.confirm_flag = 1
+ AND jgm.user_id = #{userId}
+
+ </select>
+
+ <!--更新状态-临时接口-->
+ <update id="updateView">
+ update jczz_task_report_for_repairs set view_type = 1
+ </update>
+
+
</mapper>
--
Gitblit v1.9.3