yys 修改排序

maven

2025-12-12 17132f3dd27f5bd97a081bbd9e08a37e9e8f25af

 src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml

@@ -15,6 +15,7 @@
        T2.quantity,
        T2.product_category,
        T2.specification_model,
        T2.speculative_trading_name,
        T2.unit
        FROM
        sales_ledger_product T2
@@ -40,8 +41,12 @@
            <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
                AND  T1.entry_date &lt;= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
            </if>
            <if test="salesLedgerDto.productionUserId != null and salesLedgerDto.productionUserId != '' ">
                AND  T1.entry_person = #{salesLedgerDto.productionUserId}
            </if>
        </where>
        GROUP BY T2.id
        order by T1.entry_date desc
    </select>
    <select id="list" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingDto">
        SELECT
@@ -71,19 +76,26 @@
        T2.status,
        T2.scheduling_user_id,
        T2.scheduling_user_name,
        T2.speculative_trading_name,
        T2.scheduling_date,
        ifNull(T2.scheduling_num,0) AS schedulingNum,
        ifNull(T2.finished_num,0) AS successNum,
        T1.sales_contract_no,
        T1.customer_contract_no,
        T1.project_name,
        T1.customer_name,
        t3.product_category,
        t3.specification_model,
        t3.unit
        t3.unit,
        t4.name as productionLineName,
        t4.id as productionLineId,
        T2.production_user_name,
        T2.production_user_id
        FROM
        sales_ledger_scheduling T2
        LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
        left join sales_ledger_product t3 on T2.sales_ledger_product_id = t3.id
        left join production_line t4 on t4.id = T2.production_line_id
        <where>
            t3.type = 1
            <if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">
@@ -107,7 +119,10 @@
            <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
                AND  T2.scheduling_date &lt;= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
            </if>
            <if test="salesLedgerDto.productionUserId != null and salesLedgerDto.productionUserId != '' ">
                AND  T2.production_user_id = #{salesLedgerDto.productionUserId}
            </if>
        </where>
        order by T2.status asc
        order by T2.status asc, T2.scheduling_date desc
    </select>
</mapper>