From f4c288c55d08c04cd026508b358beebfcdce5fc2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 09:29:09 +0800
Subject: [PATCH] feat(product): 添加产品型号向下复制功能并优化生产报工重量计算 - 在ProductController中新增downCopy接口实现产品型号批量复制功能 - 将ProductionProductMainDto中的bomInputQty字段重命名为inputWeight - 在ProductionProductMainServiceImpl中添加JSON解析逻辑支持从otherData中提取投入重量 - 新增resolveInputWeight、findParameterValue、findFieldValue等工具方法处理复杂参数解析 - 为ProductModelDto添加targetProductId字段用于指定复制目标 - 修复销售台账按调度员ID和姓名分组的SQL查询问题 - 优化库存服务中剩余数量计算的空值处理逻辑 - 完善生产投料数量为空时的默认值处理机制
---
src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
index 17419a4..41cd6ca 100644
--- a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
+++ b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
@@ -5,15 +5,18 @@
<select id="listPage" resultType="com.ruoyi.aftersalesservice.pojo.AfterSalesService">
select * from after_sales_service
where 1 = 1
- <if test="req.feedbackDate != null and req.feedbackDate != ''">
- and feedback_date like concat('%', #{req.feedbackDate}, '%')
+ <if test="req.feedbackDate != null">
+ AND feedback_date BETWEEN #{req.feedbackDate} AND #{req.feedbackDate}
</if>
- <if test="req.disDate != null and req.disDate != ''">
- and dis_date like concat('%', #{req.disDate}, '%')
+ <if test="req.disDate != null">
+ AND dis_date BETWEEN #{req.disDate} AND #{req.disDate}
</if>
<if test="req.tenantId != null and req.tenantId != ''">
and tenant_id = #{req.tenantId}
</if>
+ <if test="req.status != null and req.status != ''">
+ and status = #{req.status}
+ </if>
order by update_time desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3