From 06df33f156924c564c17b11fdb96c5bb298a810d Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 07 Aug 2024 11:28:29 +0800
Subject: [PATCH] 三色任务和自查任务
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 164526f..419d7fd 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -27,8 +27,8 @@
br.district_code regionCode,
br.village_code neiCode,
br.town_code streetCode,
- jp.principal as realName,
- jp.principal_phone as phone,
+ jp.principal AS realName,
+ jp.principal_phone AS phone,
jp.nine_type,
jp.front_type,
jp.place_name,
@@ -45,14 +45,22 @@
jt.source,
jt.is_deleted,
jt.house_code,
+ jppl.color,
+ jc.category_name,
jt.report_type
FROM
jczz_task jt
- LEFT JOIN jczz_place jp ON jt.house_code=jp.house_code and jp.is_deleted = 0
- LEFT JOIN blade_user bu on bu.id = jt.create_user and bu.is_deleted = 0
- LEFT JOIN jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
- LEFT JOIN blade_region br on br.code = jg.community_code
- LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
+ LEFT JOIN jczz_place jp ON jt.house_code = jp.house_code
+ AND jp.is_deleted = 0
+ LEFT JOIN blade_user bu ON bu.id = jt.create_user
+ AND bu.is_deleted = 0
+ LEFT JOIN jczz_grid jg ON jg.grid_code = jp.grid_code
+ AND jg.is_deleted = 0
+ LEFT JOIN blade_region br ON br.CODE = jg.community_code
+ LEFT JOIN jczz_police_affairs_grid jpag ON jp.jw_grid_code = jpag.jw_grid_code
+ AND jpag.is_deleted = 0
+ LEFT JOIN jczz_place_poi_label jppl on jppl.place_id = jp.id and jppl.type = 3
+ LEFT JOIN jczz_category jc on jc.category_no = jppl.poi_code
<where>
<if test="isAdministrator==2">
<choose>
--
Gitblit v1.9.3