From 1d915922d8197aa5d5dc3e40e3088d983dd6e141 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 13 三月 2026 17:57:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/resources/mapper/quality/RawMaterialMapper.xml | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/quality/RawMaterialMapper.xml b/src/main/resources/mapper/quality/RawMaterialMapper.xml
new file mode 100644
index 0000000..a5869d5
--- /dev/null
+++ b/src/main/resources/mapper/quality/RawMaterialMapper.xml
@@ -0,0 +1,38 @@
+<?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.quality.mapper.RawMaterialMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.quality.pojo.RawMaterial">
+ <id column="id" property="id" />
+ <result column="product_model_id" property="productModelId" />
+ <result column="batch_no" property="batchNo" />
+ <result column="check_type" property="checkType" />
+ <result column="check_result" property="checkResult" />
+ <result column="check_user_name" property="checkUserName" />
+ <result column="check_time" property="checkTime" />
+ </resultMap>
+
+ <select id="listPage" resultType="com.ruoyi.quality.dto.RawMaterialDto">
+ SELECT
+ rm.*,
+ p.product_name,
+ pm.model,
+ pm.unit
+ FROM raw_material rm
+ LEFT JOIN product_model pm ON rm.product_model_id = pm.id
+ LEFT JOIN product p ON p.id = pm.product_id
+ where
+ 1=1
+ <if test="params.checkType != null ">
+ AND rm.check_type = #{params.checkType}
+ </if>
+ <if test="params.entryDateStart != null and params.entryDateStart != '' ">
+ AND rm.check_time >= DATE_FORMAT(#{params.entryDateStart},'%Y-%m-%d')
+ </if>
+ <if test="params.entryDateEnd != null and params.entryDateEnd != '' ">
+ AND rm.check_time <= DATE_FORMAT(#{params.entryDateEnd},'%Y-%m-%d')
+ </if>
+ ORDER BY rm.check_time DESC
+ </select>
+</mapper>
--
Gitblit v1.9.3