From 2c65c31aceb16c1d06c692266e3fb555ecafdfb5 Mon Sep 17 00:00:00 2001 From: wujian <14790700720@163.com> Date: 星期三, 23 十月 2024 09:10:47 +0800 Subject: [PATCH] change-4 --- jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml b/jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml index 8e77ca2..2888fd5 100644 --- a/jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml +++ b/jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml @@ -33,6 +33,27 @@ select id, work_order_no, sfc_code, product_code, production_line, location_code, equipment_no, inbound_time, outbound_time, in_rs_sign, in_msg_sign, out_rs_sign, out_msg_sign, collection_time, spare_field_1, spare_field_2, create_user, create_time, update_user, update_time, beat_time, repair_flag from da_passing_station_collection </sql> + <sql id="selectDaPassingStationCollectionForSearch"> + select id, work_order_no, sfc_code, product_code, location_code, inbound_time, outbound_time, out_rs_sign, collection_time from da_passing_station_collection + </sql> + + <select id="selectDaPassingStationCollectionForSearch" parameterType="DaPassingStationCollection" resultMap="DaPassingStationCollectionResult"> + <include refid="selectDaPassingStationCollectionForSearch"/> + <where> + <if test="workOrderNo != null and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if> + <if test="sfcCode != null and sfcCode != ''"> and sfc_code = #{sfcCode}</if> + <if test="productCode != null and productCode != ''"> and product_code = #{productCode}</if> + <if test="productionLine != null and productionLine != ''"> and production_line = #{productionLine}</if> + <if test="locationCode != null and locationCode != ''"> and location_code = #{locationCode}</if> + <if test="equipmentNo != null and equipmentNo != ''"> and equipment_no = #{equipmentNo}</if> + <if test="inboundTime != null "> and CAST(inbound_time as DATE) = #{inboundTime}</if> + <if test="outboundTime != null "> and CAST(outbound_time as DATE) = #{outboundTime}</if> + <if test="outRsSign != null "> and out_rs_sign = #{outRsSign}</if> + <if test="outRsSign != null "> and out_rs_sign = #{outRsSign}</if> + <if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> and outbound_time between #{startTime} and #{endTime}</if> + </where> + </select> + <select id="selectDaPassingStationCollectionList" parameterType="DaPassingStationCollection" resultMap="DaPassingStationCollectionResult"> <include refid="selectDaPassingStationCollectionVo"/> <where> -- Gitblit v1.9.3