Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

廖井涛

2024-04-19 c7631c62aac9c97e80ed59ebb2eebd4a314e0784

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

@@ -25,7 +25,8 @@
                            bend_radius,
                            edging_type,
                            weight,
                            perimeter
                            perimeter,
                            other_columns
                          )
        values
        <foreach collection ="orderDetails" item="orderDetail" separator =",">
@@ -49,7 +50,8 @@
            #{orderDetail.bendRadius},
            #{orderDetail.edgingType},
            #{orderDetail.weight},
            #{orderDetail.perimeter}
            #{orderDetail.perimeter},
            #{orderDetail.otherColumns}
             )
        </foreach>
    </insert>
@@ -391,4 +393,22 @@
        order by a.id desc
    </select>

    <select id="exportOrderReport">
        SELECT
            *,
            a.create_time as createTime,
            d.type_name as levelOne,
            e.type_name as levelTwo
        from order_detail as a
         left join sd.`order` as b
                   on b.order_id = a.order_id
         left join sd.product as c
                   on c.id = a.product_id
         left join sd.basic_glass_type as d
                   on d.type_id = c.type_id
         left join sd.basic_glass_type as e
                   on e.type_id = d.belong

    </select>

</mapper>