Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

15 小时以前 ca23602089d4a5410fa5fe125b317c260536c192

 src/main/resources/mapper/basic/ProductModelMapper.xml

@@ -9,15 +9,35 @@
        <result column="product_id" property="productId" />
        <result column="model" property="model" />
        <result column="unit" property="unit" />
        <result column="speculative_trading_name" property="speculativeTradingName" />
        <result column="tenant_id" property="tenantId" />
        <result column="product_name" property="productName" />
        <result column="product_id" property="productId" />
    </resultMap>
    <select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
        select pm.*,p.product_name

    <resultMap id="ProductModelVoResultMap" type="com.ruoyi.basic.vo.ProductModelVo" extends="BaseResultMap">
        <result column="create_time" property="createTime" />
        <result column="top_product_name" property="topProductName" />
        <collection property="batchNoList"
                    ofType="java.lang.String"
                    column="{productModelId=id}"
                    select="selectBatchNoListByProductModelId"/>
    </resultMap>

    <select id="listPageProductModel" resultMap="ProductModelVoResultMap">
        WITH RECURSIVE product_root AS (
            SELECT id, parent_id, product_name
            FROM product
            WHERE parent_id IS NULL
            UNION ALL
            SELECT p.id, p.parent_id, pr.product_name
            FROM product p
            INNER JOIN product_root pr ON p.parent_id = pr.id
        )
        select pm.*, p.product_name,
               pr.product_name as top_product_name
        from product_model pm
        left join product p on pm.product_id = p.id
        left join product_root pr on p.id = pr.id
        <where>
            <if test="c.model != null and c.model != ''">
                and pm.model  like  concat('%',#{c.model},'%')
@@ -25,8 +45,33 @@
            <if test="c.productName != null and c.productName != ''">
                and p.product_name  like  concat('%',#{c.productName},'%')
            </if>
            <if test="c.topProductParentId != null and c.topProductParentId > 0">
                and p.id in (
                    WITH RECURSIVE product_tree AS (
                        SELECT id
                        FROM product
                        WHERE id = #{c.topProductParentId}

                        UNION ALL

                        SELECT p.id
                        FROM product p
                        INNER JOIN product_tree pt ON p.parent_id = pt.id
                    )
                    select id from product_tree
                )
            </if>
        </where>
        order by  pm.id
    </select>

    <select id="selectBatchNoListByProductModelId" resultType="java.lang.String">
        select distinct si.batch_no
        from stock_inventory si
        where si.product_model_id = #{productModelId}
          and si.batch_no is not null
          and si.batch_no != ''
        order by si.batch_no
    </select>
    <select id="selectLatestRecord" resultType="com.ruoyi.basic.pojo.ProductModel">
            SELECT * FROM product_model
@@ -107,4 +152,4 @@
        order by p.id,pm.id desc
    </select>

</mapper>
</mapper>