From ec5a6ede3f88abebdf7a280744ea762757f310aa Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 30 四月 2024 13:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 270f10d..d10f643 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -9,12 +9,47 @@
<result column="start_time" property="startTime" />
<result column="end_time" property="endTime" />
<result column="unit_id" property="unitId" />
+ <result column="unit_name" property="unitName" />
<result column="status" property="status" />
+ <result column="dept_id" property="deptId" />
+ <result column="dept_name" property="deptName" />
<result column="remark" property="remark" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="category" property="category" />
+ <result column="point_tag" property="pointTagString" />
</resultMap>
<select id="selectData" resultType="com.ycl.platform.base.BaseSelect">
</select>
+ <select id="page" resultMap="BaseResultMap">
+ SELECT
+ typ.id,
+ typ.point_name,
+ typ.point_tag,
+ typ.start_time,
+ typ.end_time,
+ typ.unit_id,
+ tyu.unit_name,
+ typ.status,
+ typ.dept_id,
+ sd.dept_name,
+ typ.remark,
+ typ.create_time,
+ typ.update_time,
+ typ.point_tag,
+ typ.category
+ FROM
+ t_yw_point typ
+ LEFT JOIN t_yw_unit tyu ON typ.unit_id = tyu.id AND tyu.deleted = 0
+ LEFT JOIN sys_dept sd ON typ.dept_id = sd.dept_id AND sd.del_flag = 0
+ <where>
+ <if test="query.pointName != null and query.pointName != ''">
+ AND typ.point_name like concat('%', #{query.pointName}, '%')
+ </if>
+ </where>
+ </select>
+
</mapper>
--
Gitblit v1.8.0