From eb70b7a3685a3378dd0bfe777d0ba67615e050e7 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 31 May 2023 19:59:48 +0800
Subject: [PATCH] 返回上报人
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml
index f481184..401da48 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml
@@ -8,6 +8,7 @@
<result property="gateStatus" column="gate_status"/>
<result property="content" column="content"/>
<result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+ <result property="reportUser" column="real_name"/>
<result property="createDept" column="create_dept"/>
<result property="createUser" column="create_user"/>
@@ -20,9 +21,21 @@
<select id="selectRecordPage" resultMap="vo">
+ SELECT R.*,arb."name" reservoirName,U.REAL_NAME FROM SM_SCHEDULING_RECORD R
+ LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = R.reservoir_id
+ LEFT JOIN BLADE_USER U ON U.ID = R.CREATE_USER
+ WHERE R.IS_DELETED = 0
+ <if test="record.reservoirName != null and record.reservoirName !=''">
+ AND arb."name" LIKE CONCAT('%',#{record.reservoirName},'%')
+ </if>
+ <if test="record.gateStatus !=null and record.gateStatus !=''">
+ AND R.gate_status = #{record.gateStatus}
+ </if>
+ </select>
+ <select id="customizeGetDetail" resultType="cn.gistack.sm.schedulingModules.vo.SchedulingRecordVO">
SELECT R.*,arb."name" reservoirName FROM SM_SCHEDULING_RECORD R
LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = R.reservoir_id
- WHERE R.IS_DELETED = 0
+ WHERE R.IS_DELETED = 0 AND r.id = #{record.id}
<if test="record.reservoirName != null and record.reservoirName !=''">
AND arb."name" LIKE CONCAT('%',#{record.reservoirName},'%')
</if>
--
Gitblit v1.9.3