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/ProductionPlanMapper.xml | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionPlanMapper.xml b/src/main/resources/mapper/production/ProductionPlanMapper.xml
index 9984fcf..69ccd36 100644
--- a/src/main/resources/mapper/production/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/production/ProductionPlanMapper.xml
@@ -16,7 +16,6 @@
<result column="qty_required" property="qtyRequired"/>
<result column="issued" property="issued"/>
<result column="source" property="source"/>
- <result column="is_audit" property="isAudit"/>
<result column="promised_delivery_date" property="promisedDeliveryDate"/>
</resultMap>
@@ -26,10 +25,14 @@
pm.model,
p.id as productId,
p.product_name AS productName,
- pm.unit
+ pm.unit,
+ sl.sales_contract_no,
+ sl.customer_name,
+ sl.project_name
FROM production_plan pp
left join product_model pm on pp.product_model_id = pm.id
left join product p on pm.product_id = p.id
+ left join sales_ledger sl on pp.sales_ledger_id = sl.id
<where>
<if test="c != null">
<if test="c.id != null">
@@ -49,6 +52,9 @@
</if>
<if test="c.requiredDateStart != null and c.requiredDateEnd != null">
and pp.required_date between #{c.requiredDateStart} and #{c.requiredDateEnd}
+ </if>
+ <if test="c.salesContractNo != null and c.salesContractNo != ''">
+ and sl.sales_contract_no like concat('%', #{c.salesContractNo}, '%')
</if>
</if>
</where>
@@ -81,4 +87,23 @@
left join product p on pm.product_id = p.id
WHERE pp.id = #{productionPlanId}
</select>
+ <select id="getSource" resultType="com.ruoyi.production.bean.vo.ProductionPlanVo">
+ SELECT
+ pp.*,
+ pm.model,
+ p.product_name AS productName,
+ pm.unit,
+ sl.sales_contract_no,
+ sl.customer_name,
+ sl.project_name
+ FROM production_plan pp
+ LEFT JOIN product_model pm ON pp.product_model_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
+ left join sales_ledger sl on pp.sales_ledger_id = sl.id
+ WHERE pp.id IN
+ <foreach collection="ids" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ ORDER BY pp.id ASC
+ </select>
</mapper>
--
Gitblit v1.9.3