From 7ff5e9edadf446d0d033574a7b0ae802f5ac2233 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期六, 17 二月 2024 15:36:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml b/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
index 39d1b06..8163148 100644
--- a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
@@ -79,8 +79,19 @@
<if test="finalAssemblyOfflineTime != null and finalAssemblyOfflineTime != ''"> and final_assembly_offline_time = #{finalAssemblyOfflineTime}</if>
<if test="cvtLaunchTime != null and cvtLaunchTime != ''"> and cvt_launch_time = #{cvtLaunchTime}</if>
<if test="cvtOfflineTime != null and cvtOfflineTime != ''"> and cvt_offline_time = #{cvtOfflineTime}</if>
-
-
+ <if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> and cvt_offline_time between #{startTime} and #{endTime}</if>
+ <if test="engineNoList != null and engineNoList.size() > 0">
+ and engine_no in
+ <foreach collection="engineNoList" open="(" close=")" separator="," item="engine">
+ #{engine}
+ </foreach>
+ </if>
+ <if test="engineNoListExcel != null and engineNoListExcel.size() > 0">
+ and engine_no in
+ <foreach collection="engineNoListExcel" open="(" close=")" separator="," item="engine">
+ #{engine}
+ </foreach>
+ </if>
</where>
</select>
@@ -99,6 +110,10 @@
</if>
</where>
</select>
+ <select id="getProduceNumToday" resultType="java.lang.Integer">
+ select count(*) from bs_order_scheduling
+ where ${queryField} BETWEEN #{startTime} AND #{endTime}
+ </select>
<insert id="insertBsOrderScheduling" parameterType="BsOrderScheduling" useGeneratedKeys="true" keyProperty="id">
--
Gitblit v1.9.3