From fe1b02a121c173e9b2d56bbe5a1982e0e69e0548 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 28 四月 2026 18:06:08 +0800
Subject: [PATCH] feat(production): 新增生产工单管理功能 - 创建 ProductionOperationTask 实体类定义工单数据结构 - 实现 ProductionOperationTaskController 提供工单的增删改查接口 - 开发 ProductionOperationTaskService 和实现类处理业务逻辑 - 配置 ProductionOperationTaskMapper 及 XML 文件实现数据库操作 - 添加 ProductionOperationTaskVo 视图对象用于数据展示 - 扩展 ProductionOrder 实体类增加生产订单相关属性 - 更新 ProductionOrderMapper.xml 完善订单查询映射配置 - 优化 ProductionOrderPickRecordMapper.xml 记录物料领取明细 - 新增 ProductionOrderRoutingOperationParam 参数配置实体 - 完善 工序参数处理逻辑
---
src/main/resources/mapper/safe/SafeTrainingMapper.xml | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/mapper/safe/SafeTrainingMapper.xml b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
index 473b5f2..14f0a37 100644
--- a/src/main/resources/mapper/safe/SafeTrainingMapper.xml
+++ b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
@@ -31,22 +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 1=1
+ 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 c.trainingDate != ''">
- and st.training_date = #{c.trainingDate}
+ <if test="c.trainingDate != null ">
+ AND DATE_FORMAT(st.training_date, '%Y%m%d') = DATE_FORMAT(#{c.trainingDate}, '%Y%m%d')
</if>
- <if test="c.state != null and c.state != ''">
- and st.state like concat('%', #{c.state}, '%')
- </if>
+ GROUP BY st.id, su.nick_name
</select>
<select id="getSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
select st.*,
--
Gitblit v1.9.3