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/SafeHazardRecordMapper.xml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/safe/SafeHazardRecordMapper.xml b/src/main/resources/mapper/safe/SafeHazardRecordMapper.xml
new file mode 100644
index 0000000..cd6a85f
--- /dev/null
+++ b/src/main/resources/mapper/safe/SafeHazardRecordMapper.xml
@@ -0,0 +1,54 @@
+<?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.SafeHazardRecordMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.safe.pojo.SafeHazardRecord">
+ <id column="id" property="id" />
+ <result column="material_record_code" property="materialRecordCode" />
+ <result column="safe_hazard_id" property="safeHazardId" />
+ <result column="apply_user_id" property="applyUserId" />
+ <result column="apply_time" property="applyTime" />
+ <result column="apply_qty" property="applyQty" />
+ <result column="apply_purpose" property="applyPurpose" />
+ <result column="return_user_id" property="returnUserId" />
+ <result column="return_time" property="returnTime" />
+ <result column="return_remark" property="returnRemark" />
+ <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="pageSafeHazardRecord" resultType="com.ruoyi.safe.dto.SafeHazardRecordDto">
+ select shr.*,
+ su1.nick_name applyUserName,
+ su2.nick_name returnUserName,
+ sh.name,
+ sh.code,
+ sh.type,
+ sh.risk_level,
+ sh.location
+ from safe_hazard_record shr
+ left join sys_user su1 on shr.apply_user_id = su1.user_id
+ left join sys_user su2 on shr.return_user_id = su2.user_id
+ left join safe_hazard sh on shr.safe_hazard_id = sh.id
+ where 1=1
+ <if test="c.materialRecordCode != null and c.materialRecordCode != ''">
+ and shr.material_record_code like concat('%', #{c.materialRecordCode}, '%')
+ </if>
+ <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