From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSparePartScrapMapper.xml |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSparePartScrapMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSparePartScrapMapper.xml
new file mode 100644
index 0000000..8139489
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSparePartScrapMapper.xml
@@ -0,0 +1,25 @@
+<?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="org.jeecg.modules.eam.mapper.EamSparePartScrapMapper">
+
+    <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamSparePartScrap">
+        SELECT
+            t1.id,
+            t1.scrap_code as scrapCode,
+            t1.scrap_num as scrapNum,
+            t2.id as sparePartsId,
+            t2.part_code as partCode,
+            t2.part_name as partName,
+            t2.part_model as partModel,
+            t2.part_specification as partSpecification,
+            t1.report_user as reportUser,
+            t1.approval_user as approvalUser,
+            t1.approval_time as  approvalTime,
+            t1.scrap_reason as scrapReason,
+            t1.scrap_status as scrapStatus
+        FROM
+            eam_spare_part_scrap t1
+            LEFT JOIN eam_spare_parts t2 ON t1.spare_parts_id = t2.id
+        ${ew.customSqlSegment}
+    </select>
+</mapper>
\ No newline at end of file

--
Gitblit v1.9.3