From 2683793796366a4b6361baf4a16e5c65c8dce068 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 21 四月 2026 16:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/production/ProductionProductInputMapper.xml | 37 +++++++++++++------------------------
1 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductInputMapper.xml b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
index eab625b..236aa2b 100644
--- a/src/main/resources/mapper/production/ProductionProductInputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
@@ -1,28 +1,17 @@
-<?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">
+<?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.production.mapper.ProductionProductInputMapper">
- <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductionProductInput">
- <id property="id" column="id"/>
- <result property="productMainId" column="product_main_id"/>
- <result property="productModelId" column="product_model_id"/>
- <result property="quantity" column="quantity"/>
- <result property="tenantId" column="tenant_id"/>
- <result property="createTime" column="create_time"/>
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductionProductInput">
+ <id column="id" property="id" />
+ <result column="input_quantity" property="inputQuantity" />
+ <result column="production_product_main_id" property="productionProductMainId" />
+ <result column="product_model_id" property="productModelId" />
+ <result column="update_time" property="updateTime" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_user" property="updateUser" />
</resultMap>
- <select id="listPageProductionProductInputDto" resultType="com.ruoyi.production.dto.ProductionProductInputDto">
- select ppi.*,
- pm.model as model,
- ppm.product_no as productNo
- from
- production_product_input ppi
- left join production_product_main ppm on ppm.id = ppi.product_main_id
- left join product_model pm on pm.id = ppi.product_model_id
- <where>
- <if test="c.productMainId != null and c.productMainId > 0">
- and ppm.id = #{c.productMainId}
- </if>
- </where>
- order by ppi.id
- </select>
+
</mapper>
--
Gitblit v1.9.3