From 6adf5d37de9739bde5bb75c51af1846da3ce6ca4 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 30 Nov 2023 17:49:05 +0800
Subject: [PATCH] 房屋标签迁移user_house_label + 圈子表+点赞+文章范围

---
 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 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 5f46893..d95b769 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -40,6 +40,12 @@
         <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>
@@ -76,15 +82,22 @@
         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
+            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 jh.confirm_flag = 1
-          AND jg.user_id = #{userId}
+          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