From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人，维护时间默认当前 2.销售报价审核非必填，产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间，修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了，增加生产订单当前工序 3.库存导入模板规格改成图纸编号，产品名称可以为空，加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量（只统计二级）
---
src/main/resources/mapper/safe/SafeTrainingMapper.xml | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/safe/SafeTrainingMapper.xml b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
index 473b5f2..b45878c 100644
--- a/src/main/resources/mapper/safe/SafeTrainingMapper.xml
+++ b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
@@ -37,15 +37,13 @@
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
+ where st.state = #{c.state}
+ GROUP BY st.id
<if test="c.placeTraining != null and 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>
- <if test="c.state != null and c.state != ''">
- and st.state like concat('%', #{c.state}, '%')
+ <if test="c.trainingDate != null ">
+ and st.training_date = date_format(#{c.trainingDate},'%Y%m%d')
</if>
</select>
<select id="getSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
--
Gitblit v1.9.3