Merge remote-tracking branch 'origin/master'

cl

2024-02-17 7ff5e9edadf446d0d033574a7b0ae802f5ac2233

 jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml

@@ -26,10 +26,11 @@
        <result property="updateUser"    column="update_user"    />
        <result property="updateTime"    column="update_time"    />
        <result property="beatTime"    column="beat_time"    />
        <result property="repairFlag"    column="repair_flag"    />
    </resultMap>

    <sql id="selectDaPassingStationCollectionVo">
        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 from da_passing_station_collection
        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>

    <select id="selectDaPassingStationCollectionList" parameterType="DaPassingStationCollection" resultMap="DaPassingStationCollectionResult">
@@ -45,7 +46,7 @@
            <if test="outboundTime != null "> and outbound_time = #{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>
    
@@ -53,7 +54,15 @@
        <include refid="selectDaPassingStationCollectionVo"/>
        where id = #{id}
    </select>
        
    <select id="getListBySfcCode"
            resultMap="DaPassingStationCollectionResult">
        <include refid="selectDaPassingStationCollectionVo"/>
        where sfc_code in
            <foreach collection="engineNoList" open="(" close=")" item="code" separator=",">
            #{code}
            </foreach>
    </select>

    <insert id="insertDaPassingStationCollection" parameterType="DaPassingStationCollection">
        insert into da_passing_station_collection
        <trim prefix="(" suffix=")" suffixOverrides=",">