From eec41baec6003ec443129bd1ae53ea2b2e5df4f3 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期六, 20 一月 2024 13:35:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 24ffd8a..d64a55c 100644
--- a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
@@ -66,6 +66,8 @@
<if test="updateUser != null and updateUser != ''"> and update_user = #{updateUser}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
<if test="report30 != null and report30 != ''"> and report_30 = #{report30}</if>
+ <if test="dateConditions != null and dateConditions != ''"> and operate_time BETWEEN #{startTime} AND #{endTime}</if>
+
</where>
</select>
@@ -74,7 +76,19 @@
<include refid="selectBsOrderSchedulingVo"/>
where id = #{id}
</select>
-
+ <select id="getPrepareOnlineList" resultType="com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling">
+ select bos.* from bs_order_scheduling bos
+ <where>
+ <if test="prepareOnlineQuery.orderNo != null and prepareOnlineQuery.orderNo != '' ">
+ and bos.order_no = #{prepareOnlineQuery.orderNo}
+ </if>
+ <if test="prepareOnlineQuery.engineNo != null and prepareOnlineQuery.engineNo != '' ">
+ and bos.engine_no = #{prepareOnlineQuery.engineNo}
+ </if>
+ </where>
+ </select>
+
+
<insert id="insertBsOrderScheduling" parameterType="BsOrderScheduling" useGeneratedKeys="true" keyProperty="id">
insert into bs_order_scheduling
<trim prefix="(" suffix=")" suffixOverrides=",">
--
Gitblit v1.9.3