gongchunyi
昨天 f3715712dc101a12a5d91e7231888fbc06452b8f
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -70,12 +70,15 @@
            <if test="req.timeStr != null and req.timeStr != ''">
                and t1.create_time like concat('%',#{req.timeStr},'%')
            </if>
            <if test="req.productModelId != null">
                and t1.product_model_id = #{req.productModelId}
            </if>
        </where>
    </select>
    <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
        select t3.supplier_name as supplierName,
               t3.purchase_contract_number as purchaseContractNumber,
        select t3.supplier_name                    as supplierName,
               t3.purchase_contract_number         as purchaseContractNumber,
               case
                   when t2.product_category is null then t5.product_name
                   else t2.product_category end    as productCategory,
@@ -106,7 +109,7 @@
    <select id="listPageCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
        select
        t3.supplier_name,
        t3.supplier_name as supplierName,
        t3.purchase_contract_number,
        case when t2.product_category is null then t5.product_name
        else t2.product_category end as productCategory,
@@ -161,11 +164,14 @@
            </if>
        </where>
        group by
            t3.supplier_name,
            t3.purchase_contract_number,
            productCategory,
            specificationModel,
            unit
        t3.supplier_name,
        t3.purchase_contract_number,
        productCategory,
        specificationModel,
        unit
        order by
        (t3.supplier_name IS NULL) DESC,
        t3.supplier_name ASC
    </select>
    <select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">