From e54d2c2c556b43cf4ffb25dfe3cf35eb5e4cd037 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 29 May 2023 11:59:01 +0800
Subject: [PATCH] 管护模块
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml | 31 +++++++++++++++++++++++++++++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/vo/ManageProtectRecordVO.java | 3 +++
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
index ac5c1ee..f25ea72 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
@@ -2,8 +2,35 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.gistack.sm.manageProtect.mapper.ManageProtectRecordMapper">
- <select id="selectRecordPage" resultType="cn.gistack.sm.manageProtect.vo.ManageProtectRecordVO">
- SELECT R.* FROM SM_MANAGE_PROTECT_RECORD R
+ <resultMap id="vo" type="cn.gistack.sm.manageProtect.vo.ManageProtectRecordVO">
+ <id property="id" column="id"/>
+ <result property="reservoirId" column="reservoir_id"/>
+ <result property="reservoirName" column="reservoirName"/>
+ <result property="type" column="type"/>
+ <result property="content" column="content"/>
+ <result property="reportTime" column="report_time"/>
+ <result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+ <result property="videos" column="videos" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+
+ <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_MANAGE_PROTECT_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.type !=null and record.type !=''">
+ AND R.type = #{record.type}
+ </if>
</select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/vo/ManageProtectRecordVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/vo/ManageProtectRecordVO.java
index 35d41ff..1b10165 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/vo/ManageProtectRecordVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/vo/ManageProtectRecordVO.java
@@ -5,4 +5,7 @@
@Data
public class ManageProtectRecordVO extends ManageProtectRecord {
+
+ private String reservoirName;
+
}
--
Gitblit v1.9.3