From d30e385951ce03335a5023f0775fd144da3c0b88 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 18 三月 2025 11:18:31 +0800
Subject: [PATCH] 修改
---
src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml b/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml
index 641ddf3..e9c7928 100644
--- a/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml
+++ b/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml
@@ -2,6 +2,16 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.server.progressTrack.dao.DjJdgzTrackRecordDao">
+ <update id="retract">
+ UPDATE dj_jdgz_track_record
+ SET CURRENT_STATUS = 0
+ WHERE LEVEL3_NETWORK_ID = (
+ SELECT LEVEL3_NETWORK_ID FROM dj_jdgz_track_record WHERE id = ${id}
+ )
+ AND create_date >= (
+ SELECT create_date FROM dj_jdgz_track_record WHERE id = ${id}
+ );
+ </update>
<select id="getList" resultType="com.example.server.progressTrack.model.DjJdgzTrackRecord">
SELECT
@@ -59,9 +69,6 @@
WHERE
a.IS_DELETE = 0
and a.network_id != 10000
- <if test="userId!=null">
- AND a.TEAMGROUP_ID in (select teamgroup from sys_user where is_delete=0 and user_id=#{userId})
- </if>
<if test="status==1">
AND b.CURRENT_STATUS = 1
</if>
@@ -74,6 +81,21 @@
AND f.IS_DELETE = 0
AND g.IS_DELETE = 0
AND g.id = ${level1NetworkId}
+ <if test="deptId!=null">
+ and c.dept_id = ${deptId}
+ </if>
+ <if test="teamId!=null">
+ and c.TEAMGROUP_ID = ${teamId}
+ </if>
+ <if test="cabinId!=null">
+ and c.cabin_id LIKE '%${cabinId}%'
+ </if>
+ <if test="type!=null and type!=''">
+ and c.type = #{type}
+ </if>
+ <if test="name!=null and name!=''">
+ and c.name LIKE '%${name}%'
+ </if>
<if test="status==0">
GROUP BY
c.id
@@ -89,8 +111,8 @@
select GENERAL_REPAIR_UNIT || ',' || GENERAL_REPAIR_UNIT_DIRECTOR || ',' ||
GENERAL_REPAIR_UNIT_CONTACT AS generalRepair,
REPAIR_UNIT || ',' || REPAIR_UNIT_DIRECTOR || ',' || REPAIR_UNIT_CONTACT AS `repair`,
- track_person || ',' || track_person_contact AS trackPerson,
- tracked_person || ',' || tracked_person_contact AS trackedPerson,
+ track_person || ',' || track_person_unit || ',' || track_person_contact AS trackPerson,
+ tracked_person || ',' || tracked_person_unit || ',' || tracked_person_contact AS trackedPerson,
track_method,
track_location,
CURRENT_STATUS,
@@ -194,8 +216,8 @@
b.GENERAL_REPAIR_UNIT|| ',' || b.GENERAL_REPAIR_UNIT_DIRECTOR|| ',' ||
b.GENERAL_REPAIR_UNIT_CONTACT AS generalRepair,
b.REPAIR_UNIT|| ',' || b.REPAIR_UNIT_DIRECTOR|| ',' || b.REPAIR_UNIT_CONTACT AS `repair`,
- b.track_person|| ',' || b.track_person_contact AS trackPerson,
- b.tracked_person|| ',' || b.tracked_person_contact AS trackedPerson,
+ b.track_person|| ',' || b.track_person_unit || ',' || b.track_person_contact AS trackPerson,
+ b.tracked_person|| ',' || b.tracked_person_unit || ',' || b.tracked_person_contact AS trackedPerson,
b.track_method,
b.track_location,
b.track_location,
@@ -213,7 +235,7 @@
LEFT JOIN dj_jdgz_network_level2 e ON e.id = d.NETWORK_ID
LEFT JOIN dj_jdgz_network_level1_list f ON f.id = e.LEVEL1_NODE_ID
LEFT JOIN dj_jdgz_network_level1 g ON g.id = c.LEVEL1_NETWORK_ID
- LEFT JOIN dj_sys_teamgroup_class h ON h.id = a.TEAMGROUP_ID
+ LEFT JOIN dj_sys_teamgroup_class h ON h.id = c.TEAMGROUP_ID
WHERE
a.IS_DELETE = 0
and a.network_id != 10000
--
Gitblit v1.9.1