From 94e23a3d587846f10ea9517bd2e6705093d6a99a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 28 一月 2026 17:57:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/safe/SafeHazardMapper.xml | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/safe/SafeHazardMapper.xml b/src/main/resources/mapper/safe/SafeHazardMapper.xml
new file mode 100644
index 0000000..328a5a5
--- /dev/null
+++ b/src/main/resources/mapper/safe/SafeHazardMapper.xml
@@ -0,0 +1,44 @@
+<?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="com.ruoyi.safe.mapper.SafeHazardMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.safe.pojo.SafeHazard">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="code" property="code" />
+ <result column="type" property="type" />
+ <result column="risk_level" property="riskLevel" />
+ <result column="location" property="location" />
+ <result column="spec_info" property="specInfo" />
+ <result column="control_measures" property="controlMeasures" />
+ <result column="principal_user_id" property="principalUserId" />
+ <result column="principal_mobile" property="principalMobile" />
+ <result column="stock_qty" property="stockQty" />
+ <result column="remark" property="remark" />
+ <result column="create_time" property="createTime" />
+ <result column="create_user" property="createUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="tenant_id" property="tenantId" />
+ </resultMap>
+ <select id="pageSafeHazard" resultType="com.ruoyi.safe.pojo.SafeHazard">
+ select sh.*, su.nick_name principalUser
+ from safe_hazard sh
+ left join sys_user su on sh.principal_user_id = su.user_id
+ where 1=1
+ <if test="c.name != null and c.name != ''">
+ and sh.name like concat('%', #{c.name}, '%')
+ </if>
+ <if test="c.code != null and c.code != ''">
+ and sh.code like concat('%', #{c.code}, '%')
+ </if>
+ <if test="c.type != null and c.type != ''">
+ and sh.type like concat('%', #{c.type}, '%')
+ </if>
+ <if test="c.riskLevel != null and c.riskLevel != ''">
+ and sh.risk_level like concat('%', #{c.riskLevel}, '%')
+ </if>
+ </select>
+
+</mapper>
--
Gitblit v1.9.3