From 2a1f1e617ccab2927ce66f37f11c9cb4f8bd2b4c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Jan 2024 22:23:15 +0800
Subject: [PATCH] 字段移除处理
---
src/main/java/org/springblade/modules/task/mapper/TaskCampusReportingEventMapper.xml | 4 ----
src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml | 6 ------
src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml | 4 ----
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 11 +++--------
4 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskCampusReportingEventMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskCampusReportingEventMapper.xml
index 7fea769..d68037c 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskCampusReportingEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskCampusReportingEventMapper.xml
@@ -46,8 +46,6 @@
id,
task_id,
place_id,
- district_id,
- district_name,
check_time,
check_user_id,
check_user_name,
@@ -87,8 +85,6 @@
<if test="taskCampusReportingEvent.id != null "> and id = #{taskCampusReportingEvent.id}</if>
<if test="taskCampusReportingEvent.taskId != null "> and task_id = #{taskCampusReportingEvent.taskId}</if>
<if test="taskCampusReportingEvent.placeId != null "> and place_id = #{taskCampusReportingEvent.placeId}</if>
- <if test="taskCampusReportingEvent.districtId != null and taskCampusReportingEvent.districtId != ''"> and district_id = #{taskCampusReportingEvent.districtId}</if>
- <if test="taskCampusReportingEvent.districtName != null and taskCampusReportingEvent.districtName != ''"> and district_name = #{taskCampusReportingEvent.districtName}</if>
<if test="taskCampusReportingEvent.checkTime != null "> and check_time = #{taskCampusReportingEvent.checkTime}</if>
<if test="taskCampusReportingEvent.checkUserId != null "> and check_user_id = #{taskCampusReportingEvent.checkUserId}</if>
<if test="taskCampusReportingEvent.checkUserName != null and taskCampusReportingEvent.checkUserName != ''"> and check_user_name = #{taskCampusReportingEvent.checkUserName}</if>
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml
index 82b8e8d..e4f3766 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml
@@ -8,8 +8,6 @@
<result column="task_id" property="taskId"/>
<result column="hotel_name" property="hotelName"/>
<result column="place_id" property="placeId"/>
- <result column="district_id" property="districtId"/>
- <result column="district_name" property="districtName"/>
<result column="check_time" property="checkTime"/>
<result column="check_user_id" property="checkUserId"/>
<result column="check_user_name" property="checkUserName"/>
@@ -40,8 +38,6 @@
task_id,
hotel_name,
place_id,
- district_id,
- district_name,
check_time,
check_user_id,
check_user_name,
@@ -64,12 +60,10 @@
sc_flag,
confirm_notion,
confirm_flag,
- tenant_id,
is_deleted,
create_time,
update_time,
create_user,
- create_dept,
update_user,
status
from jczz_task_hotel_reporting where is_deleted = 0
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
index e25a897..063ef9a 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
@@ -7,8 +7,6 @@
<result column="id" property="id"/>
<result column="task_id" property="taskId"/>
<result column="place_id" property="placeId"/>
- <result column="house_id" property="houseId"/>
- <result column="district_id" property="districtId"/>
<result column="happen_time" property="happenTime"/>
<result column="user_id" property="userId"/>
<result column="image_urls" property="imageUrls"/>
@@ -21,8 +19,6 @@
<result column="confirm_notion" property="confirmNotion"/>
<result column="owner" property="owner"/>
<result column="phone_number" property="phoneNumber"/>
- <result column="house_name" property="houseName"/>
- <result column="task_name" property="taskName"/>
<result column="transaction_object_tel" property="transactionObjectTel"/>
<result column="transaction_money" property="transactionMoney"/>
<result column="goods_nums" property="goodsNums"/>
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 aec0485..57d4cb4 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -14,6 +14,7 @@
<result column="update_time" property="updateTime"/>
<result column="update_user" property="updateUser"/>
<result column="status" property="status"/>
+ <result column="source" property="source"/>
<result column="is_deleted" property="isDeleted"/>
<result column="house_code" property="houseCode"/>
<result column="report_type" property="reportType"/>
@@ -184,13 +185,11 @@
AND jgm.user_id = #{userId} )
</if>
</where>
-
order by jt.create_time desc
</select>
<select id="selectTaskPageBy" resultType="org.springblade.modules.task.vo.TaskVO">
-
SELECT
jt.* ,
jda.address_name
@@ -210,9 +209,8 @@
AND jc.res_police_user_id = #{task.userId}
</if>
</where>
-
-
</select>
+
<select id="getBailReportingPage" resultType="org.springblade.modules.task.vo.TaskVO">
SELECT
IFNULL( jda.address_name, jp.location ) AS address_name,
@@ -233,8 +231,7 @@
jt.update_time,
jt.update_user,
jt.STATUS,
- jt.tenant_id,
- jt.create_dept,
+ jt.source,
jt.is_deleted,
jt.house_code,
jt.report_type
@@ -309,8 +306,6 @@
<if test="task.createUser != null ">and jt.create_user = #{task.createUser}</if>
<if test="task.updateTime != null ">and jt.update_time = #{task.updateTime}</if>
<if test="task.updateUser != null ">and jt.update_user = #{task.updateUser}</if>
- <if test="task.tenantId != null and task.tenantId != ''">and jt.tenant_id = #{task.tenantId}</if>
- <if test="task.createDept != null ">and jt.create_dept = #{task.createDept}</if>
<if test="task.isDeleted != null ">and jt.is_deleted = #{task.isDeleted}</if>
<if test="task.houseCode != null and task.houseCode != ''">and jt.house_code = #{task.houseCode}</if>
<if test="task.startTime != null and task.startTime != '' and task.endTime != null and task.endTime != '' ">
--
Gitblit v1.9.3