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/safe/SafeTrainingMapper.xml | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/safe/SafeTrainingMapper.xml b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
index dac3417..14f0a37 100644
--- a/src/main/resources/mapper/safe/SafeTrainingMapper.xml
+++ b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
@@ -31,19 +31,21 @@
<result column="tenant_id" property="tenantId" />
</resultMap>
<select id="pageSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
- select st.*,
- su.nick_name assessmentUserName,
- count(std.id) nums
- from safe_training st
- left join safe_training_details std on std.safe_training_id = st.id
- left join sys_user su on st.assessment_user_id = su.user_id
- where st.state = #{c.state}
+ SELECT
+ st.*,
+ su.nick_name AS assessmentUserName,
+ COUNT(std.id) AS nums
+ FROM safe_training st
+ LEFT JOIN safe_training_details std ON std.safe_training_id = st.id
+ LEFT JOIN sys_user su ON st.assessment_user_id = su.user_id
+ WHERE st.state = #{c.state}
<if test="c.placeTraining != null and c.placeTraining != ''">
- and st.place_training like concat('%', #{c.placeTraining}, '%')
+ AND st.place_training LIKE CONCAT('%', #{c.placeTraining}, '%')
</if>
<if test="c.trainingDate != null ">
- and st.training_date = date_format(#{c.trainingDate},'%Y%m%d')
+ AND DATE_FORMAT(st.training_date, '%Y%m%d') = DATE_FORMAT(#{c.trainingDate}, '%Y%m%d')
</if>
+ GROUP BY st.id, su.nick_name
</select>
<select id="getSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
select st.*,
--
Gitblit v1.9.3