Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-10-11 82a5de6d2ec80b45660149c84be28734032562f6

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

@@ -15,17 +15,17 @@

    <select id="selectMaxOrderId">
        select
           ifnull(SUBSTR(max(order_id) from 9),0)
           ifnull(SUBSTR(max(right(order_id,8)) from 7),0)
        from
            `order` as a
        where
            date(a.create_time) = curdate()
        order by id desc,order_id   desc limit  1
        /*order by order_id desc,order_id   desc limit  1*/
    </select>

    <select id="selectMaxOrderIdByMonth">
        select
            ifnull(SUBSTR(max(order_id) from 7),0)
            ifnull(SUBSTR(max(right(order_id,8)) from 5),0)
        from
            `order` as a
        where
@@ -33,14 +33,43 @@
    </select>

    <select id="selectMaxOrderIdByYear">
        select
            ifnull(SUBSTR(max(order_id) from 5),0)
       select
           ifnull(SUBSTR(max(right(order_id,8)) from 3),0)
        from
            `order` as a
        where
            year(a.create_time)  = year(NOW())
            year(a.create_time)  = year(now())
            and a.id>400
    </select>

    <select id="selectOrderIdMin">
        select count(*) from sd.`order` where SUBSTR(order_id,3,11)>#{substringInt}
    </select>

    <select id="selectOrderIdIs">
        select count(*) from sd.`order` where SUBSTR(order_id,3,11)=#{substringInt}
    </select>

    <select id="selectOrderIdDay">
        select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},9,2)=01
    </select>

    <select id="selectOrderIdMonth">
        select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},7,4)=0001
    </select>

    <select id="selectOrderIdYear">
        select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},5,2)=000001
    </select>

    <select id="selectOrderId">
        select * from sd.`order` where order_id=#{orderId}
    </select>

    <update id="updateOrderId">
        update sd.`order` set order_id=#{newOrderId} where order_id=#{oldOrderId}
    </update>

    <update id="updateOrderParameter">
        update `order` o
        left join