From 1deb9e75f81d84ae656faa7175cf4c5d6cc4e831 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 29 May 2023 15:37:18 +0800
Subject: [PATCH] 调度模块

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 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 1f1ca23..f481184 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
@@ -1,9 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.gistack.sm.schedulingModules.mapper.SchedulingRecordMapper">
+    <resultMap id="vo" type="cn.gistack.sm.schedulingModules.vo.SchedulingRecordVO">
+        <id property="id" column="id"/>
+        <result property="reservoirId" column="reservoir_id"/>
+        <result property="reservoirName" column="reservoirName"/>
+        <result property="gateStatus" column="gate_status"/>
+        <result property="content" column="content"/>
+        <result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
 
-    <select id="selectRecordPage" resultType="cn.gistack.sm.schedulingModules.vo.SchedulingRecordVO">
-        SELECT R.* FROM SM_SCHEDULING_RECORD R
+        <result property="createDept" column="create_dept"/>
+        <result property="createUser" column="create_user"/>
+        <result property="updateUser" column="update_user"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="status" column="status"/>
+        <result property="isDeleted" column="is_deleted"/>
+    </resultMap>
+
+
+    <select id="selectRecordPage" resultMap="vo">
+        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
+        <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>
 </mapper>

--
Gitblit v1.9.3