Merge remote-tracking branch 'origin/master'

廖井涛

2025-08-25 fec9f42e00f2df68a2a20cbf132b17bdeed8e63a

 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml

@@ -110,7 +110,7 @@
            sd.`order` as o
        left join mm.finished_goods_inventory as  fgi
        on o.order_id = fgi.order_id
        where  date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
        where  date(o.create_time) between #{startDate} and  #{endDate}

          <if test="orderType!= null and orderType != ''">
               and o.create_order = #{orderType}
@@ -418,12 +418,22 @@


    <insert id="saveOrderFile">
        insert into sd.order_file (order_id,order_number,file_name,file_data,create_time) values(#{orderId},#{orderNumber},#{fileName},#{dxfData},now())
        insert into sd.order_file (order_id,order_number,file_name,file_data,file_json,create_time) values(#{orderId},#{orderNumber},#{fileName},#{dxfData},#{fileJson},now())
    </insert>

    <select id="selectOrderFile">
        select  * from sd.order_file
        where order_id = #{orderId}
          and order_number = #{orderNumber}
        where order_id = #{orderId} and order_number = #{orderNumber}

    </select>

    <select id="selectOrderFileList">
        select  * from sd.order_file
        where order_id = #{orderId}

    </select>

    <update id="updateOrderFile">
        update sd.order_file set file_name=#{fileName},file_data=#{dxfData},file_json=#{fileJson},create_time=now() where order_id=#{orderId} and order_number=#{orderNumber}
    </update>
</mapper>