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/compensationperformance/CompensationPerformanceMapper.xml | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml b/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml
index 6071266..a784c99 100644
--- a/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml
+++ b/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml
@@ -22,4 +22,16 @@
</where>
ORDER BY cp.pay_date DESC, cp.id DESC
</select>
+
+ <select id="exportList" resultType="com.ruoyi.compensationperformance.pojo.CompensationPerformance">
+ SELECT cp.*,
+ soj.staff_name AS staffName,
+ sp.post_name AS postName,
+ sd.dept_name AS deptName
+ FROM compensation_performance cp
+ LEFT JOIN staff_on_job soj ON soj.id = cp.staff_id
+ LEFT JOIN sys_post sp ON sp.post_id = soj.sys_post_id
+ LEFT JOIN sys_dept sd ON sd.dept_id = soj.sys_dept_id
+ ORDER BY cp.pay_date DESC, cp.id DESC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3