From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/resources/mapper/production/ProductionProductInputMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductInputMapper.xml b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
index f5e79cc..fe88ae3 100644
--- a/src/main/resources/mapper/production/ProductionProductInputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
@@ -14,7 +14,7 @@
<result column="update_user" property="updateUser" />
</resultMap>
- <select id="listPageProductionProductInputDto" resultType="com.ruoyi.production.dto.ProductionProductInputDto">
+ <select id="listPageProductionProductInputDto" resultType="com.ruoyi.production.bean.dto.ProductionProductInputDto">
select ppi.*,
ppm.product_no as productNo,
pm.model,
@@ -24,7 +24,7 @@
left join production_product_main ppm on ppi.production_product_main_id = ppm.id
left join production_operation_task pot on ppm.production_operation_task_id = pot.id
left join production_order po on pot.production_order_id = po.id
- left join product_model pm on po.product_model_id = pm.id
+ left join product_model pm on ppi.product_model_id = pm.id
left join product p on pm.product_id = p.id
<where>
<if test="c.productNo != null and c.productNo != ''">
@@ -36,6 +36,9 @@
<if test="c.productName != null and c.productName != ''">
and p.product_name like concat('%', #{c.productName}, '%')
</if>
+ <if test="c.productMainId != null and c.productMainId != ''">
+ and ppm.id = #{c.productMainId}
+ </if>
</where>
order by ppi.create_time desc
</select>
--
Gitblit v1.9.3